From e7486d6aa89015072b14d1c11fa38232edb7184e Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 17 Nov 2021 07:35:23 +0000 Subject: [PATCH] Renamed items package to item. --- .../ai/areas/PrimevalIsle/PrimevalIsle.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 2 +- .../DimensionalMerchant.java | 2 +- .../ai/others/DragonWeaponListeners.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../effecthandlers/CrystalGradeModify.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../handlers/effecthandlers/DisableSkill.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/Recovery.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 6 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q00350_EnhanceYourWeapon.java | 2 +- .../Q00421_LittleWingsBigAdventure.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../quests/Q00464_Oath/Q00464_Oath.java | 2 +- .../Q00756_TopQualityPetra.java | 2 +- .../Q10301_ShadowOfTerrorBlackishRedFog.java | 2 +- ...303_CrossroadsBetweenLightAndDarkness.java | 2 +- .../Q10304_ForForgottenHeroes.java | 2 +- .../Q10462_TemperARustingBlade.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 20 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../model/{items => item}/Armor.java | 4 +- .../gameserver/model/item}/EtcItem.java | 4 +- .../gameserver/model/item}/Henna.java | 2 +- .../gameserver/model/item}/ItemTemplate.java | 14 +- .../model/item}/PlayerItemTemplate.java | 2 +- .../model/{items => item}/WarehouseItem.java | 8 +- .../gameserver/model/item}/Weapon.java | 4 +- .../item}/appearance/AppearanceHandType.java | 2 +- .../item}/appearance/AppearanceMagicType.java | 2 +- .../item}/appearance/AppearanceStone.java | 12 +- .../appearance/AppearanceTargetType.java | 2 +- .../appearance/AppearanceType.java | 2 +- .../combination/CombinationItem.java | 2 +- .../combination/CombinationItemReward.java | 2 +- .../combination/CombinationItemType.java | 2 +- .../item}/enchant/AbstractEnchantItem.java | 12 +- .../model/item}/enchant/EnchantItemGroup.java | 2 +- .../enchant/EnchantRateItem.java | 4 +- .../enchant/EnchantResultType.java | 2 +- .../model/item}/enchant/EnchantScroll.java | 10 +- .../item}/enchant/EnchantScrollGroup.java | 4 +- .../item}/enchant/EnchantSupportItem.java | 6 +- .../enchant/attribute/AttributeHolder.java | 2 +- .../model/{items => item}/instance/Item.java | 18 +- .../{items => item}/type/ActionType.java | 2 +- .../model/item}/type/ArmorType.java | 2 +- .../model/item}/type/CrystalType.java | 2 +- .../model/item}/type/EtcItemType.java | 2 +- .../model/{items => item}/type/ItemType.java | 2 +- .../{items => item}/type/MaterialType.java | 2 +- .../model/item}/type/WeaponType.java | 2 +- .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 2 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- .../alchemy/RequestAlchemyConversion.java | 4 +- .../alchemy/RequestAlchemyTryMixCube.java | 2 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../ai/areas/PrimevalIsle/PrimevalIsle.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 2 +- .../DimensionalMerchant.java | 2 +- .../ai/others/DragonWeaponListeners.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../effecthandlers/CrystalGradeModify.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../handlers/effecthandlers/DisableSkill.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/Recovery.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 6 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q00421_LittleWingsBigAdventure.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../quests/Q00464_Oath/Q00464_Oath.java | 2 +- .../Q00756_TopQualityPetra.java | 2 +- .../Q10301_ShadowOfTerrorBlackishRedFog.java | 2 +- ...303_CrossroadsBetweenLightAndDarkness.java | 2 +- .../Q10304_ForForgottenHeroes.java | 2 +- .../Q10462_TemperARustingBlade.java | 2 +- .../Q10465_SoulFrostSword.java | 2 +- .../Q10814_BefittingOfTheStatus.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 20 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../gameserver/model/item}/Armor.java | 4 +- .../gameserver/model/item}/EtcItem.java | 4 +- .../gameserver/model/item}/Henna.java | 2 +- .../model/{items => item}/ItemTemplate.java | 14 +- .../model/item}/PlayerItemTemplate.java | 2 +- .../gameserver/model/item}/WarehouseItem.java | 8 +- .../gameserver/model/item}/Weapon.java | 4 +- .../item}/appearance/AppearanceHandType.java | 2 +- .../item}/appearance/AppearanceMagicType.java | 2 +- .../item}/appearance/AppearanceStone.java | 12 +- .../appearance/AppearanceTargetType.java | 2 +- .../appearance/AppearanceType.java | 2 +- .../combination/CombinationItem.java | 2 +- .../combination/CombinationItemReward.java | 2 +- .../combination/CombinationItemType.java | 2 +- .../item}/enchant/AbstractEnchantItem.java | 12 +- .../model/item}/enchant/EnchantItemGroup.java | 2 +- .../enchant/EnchantRateItem.java | 4 +- .../item}/enchant/EnchantResultType.java | 2 +- .../model/item}/enchant/EnchantScroll.java | 10 +- .../item}/enchant/EnchantScrollGroup.java | 4 +- .../item}/enchant/EnchantSupportItem.java | 6 +- .../enchant/attribute/AttributeHolder.java | 2 +- .../model/{items => item}/instance/Item.java | 18 +- .../{items => item}/type/ActionType.java | 2 +- .../model/item}/type/ArmorType.java | 2 +- .../{items => item}/type/CrystalType.java | 2 +- .../model/item}/type/EtcItemType.java | 2 +- .../model/{items => item}/type/ItemType.java | 2 +- .../{items => item}/type/MaterialType.java | 2 +- .../model/item}/type/WeaponType.java | 2 +- .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 2 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- .../alchemy/RequestAlchemyConversion.java | 4 +- .../alchemy/RequestAlchemyTryMixCube.java | 2 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../ai/areas/PrimevalIsle/PrimevalIsle.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 2 +- .../DimensionalMerchant.java | 2 +- .../ai/others/DragonWeaponListeners.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../effecthandlers/CrystalGradeModify.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../handlers/effecthandlers/DisableSkill.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/Recovery.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 6 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q00421_LittleWingsBigAdventure.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../quests/Q00464_Oath/Q00464_Oath.java | 2 +- .../Q00756_TopQualityPetra.java | 2 +- .../Q10301_ShadowOfTerrorBlackishRedFog.java | 2 +- ...303_CrossroadsBetweenLightAndDarkness.java | 2 +- .../Q10304_ForForgottenHeroes.java | 2 +- .../Q10462_TemperARustingBlade.java | 2 +- .../Q10465_SoulFrostSword.java | 2 +- .../Q10814_BefittingOfTheStatus.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 20 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../gameserver/model/item}/Armor.java | 4 +- .../gameserver/model/item}/EtcItem.java | 4 +- .../gameserver/model/item}/Henna.java | 2 +- .../gameserver/model/item}/ItemTemplate.java | 14 +- .../model/item}/PlayerItemTemplate.java | 2 +- .../gameserver/model/item}/WarehouseItem.java | 8 +- .../gameserver/model/item}/Weapon.java | 4 +- .../appearance/AppearanceHandType.java | 2 +- .../item}/appearance/AppearanceMagicType.java | 2 +- .../item}/appearance/AppearanceStone.java | 12 +- .../appearance/AppearanceTargetType.java | 2 +- .../appearance/AppearanceType.java | 2 +- .../combination/CombinationItem.java | 2 +- .../combination/CombinationItemReward.java | 2 +- .../combination/CombinationItemType.java | 2 +- .../item}/enchant/AbstractEnchantItem.java | 12 +- .../enchant/EnchantItemGroup.java | 2 +- .../enchant/EnchantRateItem.java | 4 +- .../item}/enchant/EnchantResultType.java | 2 +- .../model/item}/enchant/EnchantScroll.java | 10 +- .../item}/enchant/EnchantScrollGroup.java | 4 +- .../enchant/EnchantSupportItem.java | 6 +- .../enchant/attribute/AttributeHolder.java | 2 +- .../model/{items => item}/instance/Item.java | 18 +- .../{items => item}/type/ActionType.java | 2 +- .../model/item}/type/ArmorType.java | 2 +- .../model/item}/type/CrystalType.java | 2 +- .../model/item}/type/EtcItemType.java | 2 +- .../model/{items => item}/type/ItemType.java | 2 +- .../{items => item}/type/MaterialType.java | 2 +- .../model/item}/type/WeaponType.java | 2 +- .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 2 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- .../alchemy/RequestAlchemyConversion.java | 4 +- .../alchemy/RequestAlchemyTryMixCube.java | 2 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../ai/areas/PrimevalIsle/PrimevalIsle.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 2 +- .../DimensionalMerchant.java | 2 +- .../ai/others/DragonWeaponListeners.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../effecthandlers/CreateCommonItem.java | 2 +- .../handlers/effecthandlers/CreateItem.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../effecthandlers/CrystalGradeModify.java | 2 +- .../handlers/effecthandlers/Crystallize.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../handlers/effecthandlers/DisableSkill.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/Recovery.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/RemoveEquipPenalty.java | 4 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 6 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q00421_LittleWingsBigAdventure.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../quests/Q00464_Oath/Q00464_Oath.java | 2 +- .../Q00756_TopQualityPetra.java | 2 +- .../Q10301_ShadowOfTerrorBlackishRedFog.java | 2 +- ...303_CrossroadsBetweenLightAndDarkness.java | 2 +- .../Q10304_ForForgottenHeroes.java | 2 +- .../Q10462_TemperARustingBlade.java | 2 +- .../Q10465_SoulFrostSword.java | 2 +- .../Q10814_BefittingOfTheStatus.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 22 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../gameserver/model/item}/Armor.java | 4 +- .../gameserver/model/item}/EtcItem.java | 4 +- .../gameserver/model/item}/Henna.java | 2 +- .../model/{items => item}/ItemTemplate.java | 14 +- .../{items => item}/PlayerItemTemplate.java | 2 +- .../gameserver/model/item}/WarehouseItem.java | 8 +- .../gameserver/model/item}/Weapon.java | 4 +- .../appearance/AppearanceHandType.java | 2 +- .../item}/appearance/AppearanceMagicType.java | 2 +- .../appearance/AppearanceStone.java | 12 +- .../appearance/AppearanceTargetType.java | 2 +- .../appearance/AppearanceType.java | 2 +- .../combination/CombinationItem.java | 2 +- .../combination/CombinationItemReward.java | 2 +- .../combination/CombinationItemType.java | 2 +- .../enchant/AbstractEnchantItem.java | 12 +- .../enchant/EnchantItemGroup.java | 2 +- .../enchant/EnchantRateItem.java | 4 +- .../enchant/EnchantResultType.java | 2 +- .../model/item}/enchant/EnchantScroll.java | 10 +- .../item}/enchant/EnchantScrollGroup.java | 4 +- .../item}/enchant/EnchantSupportItem.java | 6 +- .../enchant/attribute/AttributeHolder.java | 2 +- .../gameserver/model/item}/instance/Item.java | 18 +- .../{items => item}/type/ActionType.java | 2 +- .../model/item}/type/ArmorType.java | 2 +- .../model/item}/type/CrystalType.java | 2 +- .../model/item}/type/EtcItemType.java | 2 +- .../model/{items => item}/type/ItemType.java | 2 +- .../{items => item}/type/MaterialType.java | 2 +- .../model/item}/type/WeaponType.java | 2 +- .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 2 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../RequestRecipeItemMakeSelf.java | 2 +- .../RequestRecipeShopMakeItem.java | 2 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- .../alchemy/RequestAlchemyConversion.java | 4 +- .../alchemy/RequestAlchemyTryMixCube.java | 2 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 4 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../ai/areas/PrimevalIsle/PrimevalIsle.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 2 +- .../DimensionalMerchant.java | 2 +- .../ai/others/DragonWeaponListeners.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../effecthandlers/CreateCommonItem.java | 2 +- .../handlers/effecthandlers/CreateItem.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../effecthandlers/CrystalGradeModify.java | 2 +- .../handlers/effecthandlers/Crystallize.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../handlers/effecthandlers/DisableSkill.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DispelCaster.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/LimitSkill.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/Recovery.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/RemoveEquipPenalty.java | 4 +- .../effecthandlers/ReplaceSkillBySkill.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../effecthandlers/TrackLimitedSkill.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 6 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q00421_LittleWingsBigAdventure.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../quests/Q00464_Oath/Q00464_Oath.java | 2 +- .../Q00756_TopQualityPetra.java | 2 +- .../Q10301_ShadowOfTerrorBlackishRedFog.java | 2 +- ...303_CrossroadsBetweenLightAndDarkness.java | 2 +- .../Q10304_ForForgottenHeroes.java | 2 +- .../Q10814_BefittingOfTheStatus.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../gameserver/data/xml/ClanShopData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 22 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemAttributeAdd.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../events/impl/item/OnItemEnchantAdd.java | 2 +- .../impl/item/OnItemSoulCrystalAdd.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/ClanShopProductHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../model/{items => item}/Armor.java | 4 +- .../gameserver/model/item/EtcItem.java | 156 +++ .../gameserver/model/item/Henna.java | 183 +++ .../model/{items => item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../model/{items => item}/WarehouseItem.java | 8 +- .../gameserver/model/item/Weapon.java | 311 +++++ .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../appearance/AppearanceStone.java | 12 +- .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../item/combination/CombinationItem.java | 65 + .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../enchant/AbstractEnchantItem.java | 12 +- .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../enchant/EnchantRateItem.java | 4 +- .../model/item/enchant/EnchantResultType.java | 27 + .../model/item}/enchant/EnchantScroll.java | 10 +- .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item}/enchant/EnchantSupportItem.java | 6 +- .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item}/type/CrystalType.java | 2 +- .../model/item}/type/EtcItemType.java | 2 +- .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/EtcItem.java | 156 --- .../gameserver/model/items/Henna.java | 183 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/Weapon.java | 311 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../items/combination/CombinationItem.java | 65 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../model/items/enchant/EnchantItemGroup.java | 97 -- .../items/enchant/EnchantResultType.java | 27 - .../items/enchant/EnchantScrollGroup.java | 82 -- .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../network/clientpackets/AddTradeItem.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 4 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../RequestRecipeItemMakeSelf.java | 2 +- .../RequestRecipeShopMakeItem.java | 2 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- .../alchemy/RequestAlchemyConversion.java | 4 +- .../alchemy/RequestAlchemyTryMixCube.java | 2 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 4 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../ai/areas/PrimevalIsle/PrimevalIsle.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 2 +- .../DimensionalMerchant.java | 2 +- .../ai/others/DragonWeaponListeners.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 4 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../effecthandlers/CreateCommonItem.java | 2 +- .../handlers/effecthandlers/CreateItem.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../effecthandlers/CrystalGradeModify.java | 2 +- .../handlers/effecthandlers/Crystallize.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../handlers/effecthandlers/DisableSkill.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DispelCaster.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/LimitSkill.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/Recovery.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/RemoveEquipPenalty.java | 4 +- .../effecthandlers/ReplaceSkillBySkill.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../effecthandlers/TrackLimitedSkill.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 6 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q00421_LittleWingsBigAdventure.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../Q00756_TopQualityPetra.java | 2 +- .../Q10301_ShadowOfTerrorBlackishRedFog.java | 2 +- ...303_CrossroadsBetweenLightAndDarkness.java | 2 +- .../Q10304_ForForgottenHeroes.java | 2 +- .../Q10814_BefittingOfTheStatus.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../gameserver/data/xml/ClanShopData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 22 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemAttributeAdd.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../events/impl/item/OnItemEnchantAdd.java | 2 +- .../impl/item/OnItemSoulCrystalAdd.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/ClanShopProductHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../gameserver/model/item}/Armor.java | 4 +- .../gameserver/model/item/EtcItem.java | 156 +++ .../gameserver/model/item/Henna.java | 183 +++ .../model/{items => item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../model/{items => item}/WarehouseItem.java | 8 +- .../gameserver/model/item/Weapon.java | 311 +++++ .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../appearance/AppearanceStone.java | 12 +- .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../item/combination/CombinationItem.java | 65 + .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../enchant/AbstractEnchantItem.java | 12 +- .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../enchant/EnchantRateItem.java | 4 +- .../model/item/enchant/EnchantResultType.java | 27 + .../enchant/EnchantScroll.java | 10 +- .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item}/enchant/EnchantSupportItem.java | 6 +- .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item}/type/CrystalType.java | 2 +- .../model/item}/type/EtcItemType.java | 2 +- .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/EtcItem.java | 156 --- .../gameserver/model/items/Henna.java | 183 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/Weapon.java | 311 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../items/combination/CombinationItem.java | 65 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../model/items/enchant/EnchantItemGroup.java | 97 -- .../items/enchant/EnchantResultType.java | 27 - .../items/enchant/EnchantScrollGroup.java | 82 -- .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../network/clientpackets/AddTradeItem.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 4 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryEnchantArtifact.java | 4 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../RequestRecipeItemMakeSelf.java | 2 +- .../RequestRecipeShopMakeItem.java | 2 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- .../alchemy/RequestAlchemyConversion.java | 4 +- .../alchemy/RequestAlchemyTryMixCube.java | 2 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 4 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../ai/areas/PrimevalIsle/PrimevalIsle.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 2 +- .../DimensionalMerchant.java | 2 +- .../ai/others/DragonWeaponListeners.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 4 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../effecthandlers/CreateCommonItem.java | 2 +- .../handlers/effecthandlers/CreateItem.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../effecthandlers/CrystalGradeModify.java | 2 +- .../handlers/effecthandlers/Crystallize.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../handlers/effecthandlers/DisableSkill.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DispelCaster.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/LimitSkill.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/Recovery.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/RemoveEquipPenalty.java | 4 +- .../effecthandlers/ReplaceSkillBySkill.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../effecthandlers/TrackLimitedSkill.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 6 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q00421_LittleWingsBigAdventure.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../Q00756_TopQualityPetra.java | 2 +- .../Q10301_ShadowOfTerrorBlackishRedFog.java | 2 +- ...303_CrossroadsBetweenLightAndDarkness.java | 2 +- .../Q10814_BefittingOfTheStatus.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../gameserver/data/xml/ClanShopData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 4 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 22 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemAttributeAdd.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../events/impl/item/OnItemEnchantAdd.java | 2 +- .../impl/item/OnItemSoulCrystalAdd.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/ClanShopProductHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../gameserver/model/item}/Armor.java | 4 +- .../gameserver/model/item/EtcItem.java | 156 +++ .../gameserver/model/item/Henna.java | 183 +++ .../gameserver/model/item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../model/{items => item}/WarehouseItem.java | 8 +- .../gameserver/model/item/Weapon.java | 311 +++++ .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../appearance/AppearanceStone.java | 12 +- .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../item/combination/CombinationItem.java | 65 + .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../enchant/AbstractEnchantItem.java | 12 +- .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../enchant/EnchantRateItem.java | 4 +- .../model/item/enchant/EnchantResultType.java | 27 + .../enchant/EnchantScroll.java | 10 +- .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item}/enchant/EnchantSupportItem.java | 6 +- .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item}/type/CrystalType.java | 2 +- .../model/item}/type/EtcItemType.java | 2 +- .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/EtcItem.java | 156 --- .../gameserver/model/items/Henna.java | 183 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/Weapon.java | 311 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../items/combination/CombinationItem.java | 65 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../model/items/enchant/EnchantItemGroup.java | 97 -- .../items/enchant/EnchantResultType.java | 27 - .../items/enchant/EnchantScrollGroup.java | 82 -- .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../network/clientpackets/AddTradeItem.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 4 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryEnchantArtifact.java | 4 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../RequestRecipeItemMakeSelf.java | 2 +- .../RequestRecipeShopMakeItem.java | 2 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- .../alchemy/RequestAlchemyConversion.java | 4 +- .../alchemy/RequestAlchemyTryMixCube.java | 2 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../RequestUpgradeSystemResult.java | 4 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../network/serverpackets/ExItemAnnounce.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 4 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 2 +- .../DimensionalMerchant.java | 2 +- .../ai/others/DragonWeaponListeners.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 4 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../effecthandlers/AddHuntingTime.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../effecthandlers/CreateCommonItem.java | 2 +- .../handlers/effecthandlers/CreateItem.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../handlers/effecthandlers/Crystallize.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../handlers/effecthandlers/DisableSkill.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DispelCaster.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/LimitSkill.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/Recovery.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ReplaceSkillBySkill.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../effecthandlers/RestoreSymbolSeal.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../effecthandlers/TrackLimitedSkill.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 4 +- .../itemhandlers/BlessedSpiritShot.java | 4 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 4 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 4 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q00756_TopQualityPetra.java | 2 +- ...303_CrossroadsBetweenLightAndDarkness.java | 2 +- .../Q10814_BefittingOfTheStatus.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../gameserver/data/xml/ClanShopData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 4 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 20 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerSymbolSealPoints.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemAttributeAdd.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../events/impl/item/OnItemEnchantAdd.java | 2 +- .../impl/item/OnItemSoulCrystalAdd.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/ClanShopProductHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../gameserver/model/item}/Armor.java | 4 +- .../gameserver/model/item/EtcItem.java | 156 +++ .../gameserver/model/item/Henna.java | 183 +++ .../model/{items => item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../model/{items => item}/WarehouseItem.java | 8 +- .../model/{items => item}/Weapon.java | 4 +- .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../appearance/AppearanceStone.java | 12 +- .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../item/combination/CombinationItem.java | 65 + .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../item/enchant/AbstractEnchantItem.java | 212 ++++ .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../enchant/EnchantRateItem.java | 4 +- .../model/item/enchant/EnchantResultType.java | 27 + .../model/item/enchant/EnchantScroll.java | 225 ++++ .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item/enchant/EnchantSupportItem.java | 64 + .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item}/type/CrystalType.java | 2 +- .../model/item/type/EtcItemType.java | 106 ++ .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/EtcItem.java | 156 --- .../gameserver/model/items/Henna.java | 183 --- .../model/items/PlayerItemTemplate.java | 45 - .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../items/combination/CombinationItem.java | 65 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../items/enchant/AbstractEnchantItem.java | 212 ---- .../model/items/enchant/EnchantItemGroup.java | 97 -- .../items/enchant/EnchantResultType.java | 27 - .../model/items/enchant/EnchantScroll.java | 225 ---- .../items/enchant/EnchantScrollGroup.java | 82 -- .../items/enchant/EnchantSupportItem.java | 64 - .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../model/items/type/EtcItemType.java | 106 -- .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../network/clientpackets/AddTradeItem.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 4 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryEnchantArtifact.java | 4 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../RequestRecipeItemMakeSelf.java | 2 +- .../RequestRecipeShopMakeItem.java | 2 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- .../alchemy/RequestAlchemyConversion.java | 4 +- .../alchemy/RequestAlchemyTryMixCube.java | 2 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../ExRequestActivateAutoShortcut.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../RequestUpgradeSystemResult.java | 4 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../network/serverpackets/ExDieInfo.java | 2 +- .../network/serverpackets/ExItemAnnounce.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../taskmanager/AutoPlayTaskManager.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../taskmanager/AutoUseTaskManager.java | 6 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 2 +- .../ai/others/DragonWeaponListeners.java | 2 +- .../others/GameAssistant/GameAssistant.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 4 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../effecthandlers/AddHuntingTime.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../effecthandlers/CreateCommonItem.java | 2 +- .../handlers/effecthandlers/CreateItem.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../handlers/effecthandlers/Crystallize.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../effecthandlers/DecreaseWaitingTime.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../handlers/effecthandlers/DisableSkill.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DispelCaster.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/LimitSkill.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/Recovery.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ReplaceSkillBySkill.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../effecthandlers/RestoreSymbolSeal.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../effecthandlers/TrackLimitedSkill.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 4 +- .../itemhandlers/BlessedSpiritShot.java | 4 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 4 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 4 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 12 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../gameserver/data/xml/ClanShopData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 4 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 18 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../ConditionMaximumVitalityPoints.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerSymbolSealPoints.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemAttributeAdd.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../events/impl/item/OnItemEnchantAdd.java | 2 +- .../impl/item/OnItemSoulCrystalAdd.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/ClanShopProductHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../model/{items => item}/Armor.java | 4 +- .../gameserver/model/item/EtcItem.java | 156 +++ .../gameserver/model/item/Henna.java | 183 +++ .../gameserver/model/item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../gameserver/model/item/WarehouseItem.java | 300 +++++ .../model/{items => item}/Weapon.java | 4 +- .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../item/appearance/AppearanceStone.java | 558 +++++++++ .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../item/combination/CombinationItem.java | 65 + .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../item/enchant/AbstractEnchantItem.java | 212 ++++ .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../model/item/enchant/EnchantScroll.java | 225 ++++ .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item/enchant/EnchantSupportItem.java | 64 + .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item}/type/CrystalType.java | 2 +- .../model/item/type/EtcItemType.java | 106 ++ .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 14 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 8 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/EtcItem.java | 156 --- .../gameserver/model/items/Henna.java | 183 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/WarehouseItem.java | 300 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../items/appearance/AppearanceStone.java | 558 --------- .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../items/combination/CombinationItem.java | 65 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../items/enchant/AbstractEnchantItem.java | 212 ---- .../model/items/enchant/EnchantItemGroup.java | 97 -- .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../model/items/enchant/EnchantScroll.java | 225 ---- .../items/enchant/EnchantScrollGroup.java | 82 -- .../items/enchant/EnchantSupportItem.java | 64 - .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../model/items/type/EtcItemType.java | 106 -- .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../network/clientpackets/AddTradeItem.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 6 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryEnchantArtifact.java | 4 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../RequestRecipeItemMakeSelf.java | 2 +- .../RequestRecipeShopMakeItem.java | 2 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- .../alchemy/RequestAlchemyConversion.java | 4 +- .../alchemy/RequestAlchemyTryMixCube.java | 2 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../ExRequestActivateAutoShortcut.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../RequestUpgradeSystemResult.java | 4 +- .../RequestExHomunculusInitPoint.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../network/serverpackets/ExDieInfo.java | 2 +- .../network/serverpackets/ExItemAnnounce.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../taskmanager/AutoPlayTaskManager.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../taskmanager/AutoUseTaskManager.java | 6 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 2 +- .../ai/others/DragonWeaponListeners.java | 2 +- .../others/GameAssistant/GameAssistant.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 4 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../effecthandlers/AddHomunculusPoints.java | 2 +- .../effecthandlers/AddHuntingTime.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../effecthandlers/CreateCommonItem.java | 2 +- .../handlers/effecthandlers/CreateItem.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../handlers/effecthandlers/Crystallize.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../effecthandlers/DecreaseWaitingTime.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../handlers/effecthandlers/DisableSkill.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DispelCaster.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/LimitSkill.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/Recovery.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ReplaceSkillBySkill.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../effecthandlers/RestoreSymbolSeal.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../effecthandlers/TrackLimitedSkill.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByDualRange.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 4 +- .../itemhandlers/BlessedSpiritShot.java | 4 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 4 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 4 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../handlers/itemhandlers/TeleportCube.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 12 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../gameserver/data/xml/ClanShopData.java | 2 +- .../gameserver/data/xml/CollectionData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 4 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 18 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../ConditionMaximumVitalityPoints.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerSymbolSealPoints.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemAttributeAdd.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../events/impl/item/OnItemEnchantAdd.java | 2 +- .../impl/item/OnItemSoulCrystalAdd.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/ClanShopProductHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../model/{items => item}/Armor.java | 4 +- .../gameserver/model/item/EtcItem.java | 156 +++ .../gameserver/model/item/Henna.java | 183 +++ .../gameserver/model/item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../gameserver/model/item/WarehouseItem.java | 300 +++++ .../model/{items => item}/Weapon.java | 4 +- .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../item/appearance/AppearanceStone.java | 558 +++++++++ .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../combination/CombinationItem.java | 2 +- .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../item/enchant/AbstractEnchantItem.java | 212 ++++ .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../model/item/enchant/EnchantScroll.java | 225 ++++ .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item/enchant/EnchantSupportItem.java | 64 + .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item}/type/CrystalType.java | 2 +- .../model/item/type/EtcItemType.java | 106 ++ .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 14 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 8 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/EtcItem.java | 156 --- .../gameserver/model/items/Henna.java | 183 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/WarehouseItem.java | 300 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../items/appearance/AppearanceStone.java | 558 --------- .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../items/enchant/AbstractEnchantItem.java | 212 ---- .../model/items/enchant/EnchantItemGroup.java | 97 -- .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../model/items/enchant/EnchantScroll.java | 225 ---- .../items/enchant/EnchantScrollGroup.java | 82 -- .../items/enchant/EnchantSupportItem.java | 64 - .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../model/items/type/EtcItemType.java | 106 -- .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../network/clientpackets/AddTradeItem.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 6 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryEnchantArtifact.java | 4 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../RequestRecipeItemMakeSelf.java | 2 +- .../RequestRecipeShopMakeItem.java | 2 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- .../alchemy/RequestAlchemyConversion.java | 4 +- .../alchemy/RequestAlchemyTryMixCube.java | 2 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../ExRequestActivateAutoShortcut.java | 2 +- .../collection/RequestCollectionRegister.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../RequestUpgradeSystemResult.java | 4 +- .../RequestExHomunculusInitPoint.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../network/serverpackets/ExDieInfo.java | 2 +- .../network/serverpackets/ExItemAnnounce.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../collection/ExCollectionRegister.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../taskmanager/AutoPlayTaskManager.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../taskmanager/AutoUseTaskManager.java | 6 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../AwakeningMaster/AwakeningMaster.java | 2 +- .../ai/others/DragonWeaponListeners.java | 2 +- .../others/GameAssistant/GameAssistant.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 4 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../effecthandlers/AddHomunculusPoints.java | 2 +- .../effecthandlers/AddHuntingTime.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../effecthandlers/CreateCommonItem.java | 2 +- .../handlers/effecthandlers/CreateItem.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../handlers/effecthandlers/Crystallize.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../effecthandlers/DecreaseWaitingTime.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../handlers/effecthandlers/DisableSkill.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DispelCaster.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/LimitSkill.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/Recovery.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ReplaceSkillBySkill.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../effecthandlers/RestoreSymbolSeal.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../effecthandlers/TrackLimitedSkill.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByDualRange.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 4 +- .../itemhandlers/BlessedSpiritShot.java | 4 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../itemhandlers/PaulinasSupportBox.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 4 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 4 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../handlers/itemhandlers/TeleportCube.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 12 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../gameserver/data/xml/ClanShopData.java | 2 +- .../gameserver/data/xml/CollectionData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 4 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../data/xml/LimitShopCraftData.java | 2 +- .../gameserver/data/xml/LimitShopData.java | 2 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 18 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../ConditionMaximumVitalityPoints.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerSymbolSealPoints.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemAttributeAdd.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../events/impl/item/OnItemEnchantAdd.java | 2 +- .../impl/item/OnItemSoulCrystalAdd.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/ClanShopProductHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../model/{items => item}/Armor.java | 4 +- .../gameserver/model/item/EtcItem.java | 156 +++ .../gameserver/model/item/Henna.java | 183 +++ .../gameserver/model/item/ItemTemplate.java | 1081 +++++++++++++++++ .../model/item/PlayerItemTemplate.java | 45 + .../gameserver/model/item/WarehouseItem.java | 300 +++++ .../model/{items => item}/Weapon.java | 4 +- .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../item/appearance/AppearanceStone.java | 558 +++++++++ .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../combination/CombinationItem.java | 2 +- .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../item/enchant/AbstractEnchantItem.java | 212 ++++ .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../model/item/enchant/EnchantScroll.java | 225 ++++ .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item/enchant/EnchantSupportItem.java | 64 + .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item/type/CrystalType.java | 115 ++ .../model/item/type/EtcItemType.java | 106 ++ .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 14 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 8 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/EtcItem.java | 156 --- .../gameserver/model/items/Henna.java | 183 --- .../gameserver/model/items/ItemTemplate.java | 1081 ----------------- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/WarehouseItem.java | 300 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../items/appearance/AppearanceStone.java | 558 --------- .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../items/enchant/AbstractEnchantItem.java | 212 ---- .../model/items/enchant/EnchantItemGroup.java | 97 -- .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../model/items/enchant/EnchantScroll.java | 225 ---- .../items/enchant/EnchantScrollGroup.java | 82 -- .../items/enchant/EnchantSupportItem.java | 64 - .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../model/items/type/CrystalType.java | 115 -- .../model/items/type/EtcItemType.java | 106 -- .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../network/clientpackets/AddTradeItem.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 6 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryEnchantArtifact.java | 4 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../RequestRecipeItemMakeSelf.java | 2 +- .../RequestRecipeShopMakeItem.java | 2 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- .../alchemy/RequestAlchemyConversion.java | 4 +- .../alchemy/RequestAlchemyTryMixCube.java | 2 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../ExRequestActivateAutoShortcut.java | 2 +- .../collection/RequestCollectionRegister.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../RequestUpgradeSystemResult.java | 4 +- .../RequestExHomunculusInitPoint.java | 2 +- .../RequestPurchaseLimitShopItemBuy.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../network/serverpackets/ExDieInfo.java | 2 +- .../network/serverpackets/ExItemAnnounce.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../collection/ExCollectionRegister.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../taskmanager/AutoPlayTaskManager.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../taskmanager/AutoUseTaskManager.java | 6 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../game/data/scripts/ai/others/EvaBox.java | 2 +- .../scripts/ai/others/ZombieGatekeepers.java | 2 +- .../KetraOrcSupport/KetraOrcSupport.java | 2 +- .../VarkaSilenosSupport.java | 2 +- .../Q415_PathToAMonk/Q415_PathToAMonk.java | 4 +- .../Q421_LittleWingsBigAdventure.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 4 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 6 +- .../l2jmobius/gameserver/data/ItemTable.java | 12 +- .../l2jmobius/gameserver/data/SkillTable.java | 2 +- .../gameserver/data/sql/TradeListTable.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../gameserver/data/xml/ManorSeedData.java | 2 +- .../gameserver/data/xml/MultisellData.java | 8 +- .../gameserver/data/xml/ZoneData.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminEditNpc.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../handler/itemhandlers/BeastSoulShot.java | 4 +- .../handler/itemhandlers/BeastSpice.java | 2 +- .../handler/itemhandlers/BeastSpiritShot.java | 4 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../gameserver/handler/itemhandlers/Book.java | 2 +- .../handler/itemhandlers/BreakingArrow.java | 2 +- .../itemhandlers/CharChangePotions.java | 2 +- .../handler/itemhandlers/ChestKey.java | 2 +- .../handler/itemhandlers/ChristmasTree.java | 2 +- .../CompBlessedSpiritShotPacks.java | 2 +- .../handler/itemhandlers/CompShotPacks.java | 2 +- .../itemhandlers/CompSpiritShotPacks.java | 2 +- .../handler/itemhandlers/CrystalCarol.java | 2 +- .../handler/itemhandlers/Crystals.java | 2 +- .../handler/itemhandlers/CustomPotions.java | 2 +- .../handler/itemhandlers/EnchantScrolls.java | 2 +- .../handler/itemhandlers/EnergyStone.java | 2 +- .../itemhandlers/ExtractableItems.java | 2 +- .../handler/itemhandlers/Firework.java | 2 +- .../handler/itemhandlers/FishShots.java | 8 +- .../handler/itemhandlers/Harvester.java | 2 +- .../handler/itemhandlers/HeroCustomItem.java | 2 +- .../handler/itemhandlers/JackpotSeed.java | 2 +- .../handler/itemhandlers/MOSKey.java | 2 +- .../itemhandlers/MapForestOfTheDead.java | 2 +- .../gameserver/handler/itemhandlers/Maps.java | 2 +- .../handler/itemhandlers/MercTicket.java | 2 +- .../handler/itemhandlers/MysteryPotion.java | 2 +- .../handler/itemhandlers/Nectar.java | 2 +- .../handler/itemhandlers/NobleCustomItem.java | 2 +- .../handler/itemhandlers/PaganKeys.java | 2 +- .../handler/itemhandlers/Potions.java | 2 +- .../handler/itemhandlers/Recipes.java | 2 +- .../handler/itemhandlers/Remedy.java | 2 +- .../handler/itemhandlers/RollingDice.java | 2 +- .../handler/itemhandlers/ScrollOfEscape.java | 2 +- .../itemhandlers/ScrollOfResurrection.java | 2 +- .../handler/itemhandlers/Scrolls.java | 2 +- .../gameserver/handler/itemhandlers/Seed.java | 2 +- .../itemhandlers/SevenSignsRecord.java | 2 +- .../handler/itemhandlers/SoulCrystals.java | 2 +- .../handler/itemhandlers/SoulShots.java | 6 +- .../handler/itemhandlers/SpecialXMas.java | 2 +- .../handler/itemhandlers/SpiritShot.java | 6 +- .../handler/itemhandlers/SummonItems.java | 2 +- .../handler/skillhandlers/Blow.java | 4 +- .../handler/skillhandlers/Fishing.java | 6 +- .../handler/skillhandlers/FishingSkill.java | 6 +- .../handler/skillhandlers/Harvest.java | 2 +- .../handler/skillhandlers/Pdam.java | 4 +- .../gameserver/handler/skillhandlers/Sow.java | 2 +- .../skillhandlers/StrSiegeAssault.java | 4 +- .../handler/skillhandlers/Sweep.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/ChristmasManager.java | 2 +- .../instancemanager/CrownManager.java | 2 +- .../DimensionalRiftManager.java | 2 +- .../FourSepulchersManager.java | 2 +- .../instancemanager/ItemsOnGroundManager.java | 4 +- .../instancemanager/MercTicketManager.java | 2 +- .../instancemanager/RebirthManager.java | 2 +- .../instancemanager/RecipeManager.java | 2 +- .../instancemanager/TradeManager.java | 2 +- .../instancemanager/games/Lottery.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../l2jmobius/gameserver/model/ItemInfo.java | 4 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../gameserver/model/StoreTradeList.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +- .../gameserver/model/WorldObject.java | 2 +- .../gameserver/model/actor/Attackable.java | 6 +- .../gameserver/model/actor/Creature.java | 6 +- .../l2jmobius/gameserver/model/actor/Npc.java | 8 +- .../gameserver/model/actor/Player.java | 16 +- .../gameserver/model/actor/Summon.java | 4 +- .../model/actor/instance/BabyPet.java | 2 +- .../gameserver/model/actor/instance/Boat.java | 4 +- .../model/actor/instance/ClassMaster.java | 2 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/FakePlayer.java | 2 +- .../model/actor/instance/FestivalGuide.java | 2 +- .../model/actor/instance/FestivalMonster.java | 2 +- .../actor/instance/FortWyvernManager.java | 2 +- .../model/actor/instance/ManorManager.java | 2 +- .../model/actor/instance/OlympiadManager.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/SepulcherNpc.java | 2 +- .../model/actor/instance/SignsPriest.java | 2 +- .../model/actor/instance/TamedBeast.java | 2 +- .../model/actor/instance/WeddingManager.java | 2 +- .../actor/knownlist/PlayerKnownList.java | 2 +- .../model/{items => item}/Armor.java | 6 +- .../model/{items => item}/EtcItem.java | 4 +- .../model/{items => item}/Henna.java | 2 +- .../model/{items => item}/ItemTemplate.java | 6 +- .../model/{items => item}/Weapon.java | 6 +- .../model/{items => item}/instance/Item.java | 10 +- .../model/{items => item}/type/ArmorType.java | 2 +- .../model/item}/type/EtcItemType.java | 2 +- .../model/{items => item}/type/ItemType.java | 2 +- .../{items => item}/type/WeaponType.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 6 +- .../model/itemcontainer/PetInventory.java | 2 +- .../model/itemcontainer/PlayerFreight.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 8 +- .../model/itemcontainer/PlayerWarehouse.java | 2 +- .../gameserver/model/olympiad/Hero.java | 4 +- .../model/olympiad/OlympiadGame.java | 2 +- .../gameserver/model/quest/QuestState.java | 2 +- .../model/sevensigns/SevenSignsFestival.java | 2 +- .../clanhalls/BanditStrongholdSiege.java | 2 +- .../siege/clanhalls/WildBeastFarmSiege.java | 2 +- .../gameserver/model/skills/Env.java | 2 +- .../gameserver/model/skills/Formulas.java | 10 +- .../conditions/ConditionSlotItemId.java | 2 +- .../conditions/ConditionSlotItemType.java | 2 +- .../conditions/ConditionTargetBodyPart.java | 4 +- .../ConditionTargetUsesWeaponKind.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/skills/funcs/FuncEnchant.java | 6 +- .../model/skills/handlers/SkillChargeDmg.java | 4 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../gameserver/model/zone/type/BossZone.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/MultiSellChoose.java | 8 +- .../clientpackets/RequestAquireSkill.java | 2 +- .../clientpackets/RequestAutoSoulShot.java | 2 +- .../network/clientpackets/RequestBuyItem.java | 2 +- .../clientpackets/RequestBuyProcure.java | 4 +- .../network/clientpackets/RequestBuySeed.java | 4 +- .../clientpackets/RequestChangePetName.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 6 +- .../clientpackets/RequestEnchantItem.java | 6 +- .../clientpackets/RequestExEnchantSkill.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 4 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 4 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../clientpackets/RequestRecordInfo.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 4 +- .../clientpackets/RequestWearItem.java | 4 +- .../SendWareHouseDepositList.java | 4 +- .../SendWareHouseWithDrawList.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- .../network/serverpackets/BuyList.java | 4 +- .../network/serverpackets/BuyListSeed.java | 2 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EquipUpdate.java | 4 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../serverpackets/GMViewHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 6 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../network/serverpackets/HennaItemInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../network/serverpackets/SellList.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/TradeStart.java | 2 +- .../network/serverpackets/TradeUpdate.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../network/serverpackets/WearList.java | 4 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 8 +- .../gameserver/util/DocumentItem.java | 14 +- .../org/l2jmobius/log/filter/ItemFilter.java | 4 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../l2jmobius/telnet/GameStatusThread.java | 2 +- .../data/scripts/ai/bosses/IceFairySirra.java | 2 +- .../game/data/scripts/ai/others/EvaBox.java | 2 +- .../scripts/ai/others/ZombieGatekeepers.java | 2 +- .../KetraOrcSupport/KetraOrcSupport.java | 2 +- .../VarkaSilenosSupport.java | 2 +- .../Q415_PathToAMonk/Q415_PathToAMonk.java | 4 +- .../Q421_LittleWingsBigAdventure.java | 2 +- .../Q662_AGameOfCards/Q662_AGameOfCards.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 4 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 6 +- .../l2jmobius/gameserver/data/ItemTable.java | 12 +- .../l2jmobius/gameserver/data/SkillTable.java | 2 +- .../gameserver/data/sql/TradeListTable.java | 2 +- .../gameserver/data/xml/AugmentationData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../gameserver/data/xml/ManorSeedData.java | 2 +- .../gameserver/data/xml/MultisellData.java | 8 +- .../gameserver/data/xml/ZoneData.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminEditNpc.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../handler/itemhandlers/BeastSoulShot.java | 4 +- .../handler/itemhandlers/BeastSpice.java | 2 +- .../handler/itemhandlers/BeastSpiritShot.java | 4 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../gameserver/handler/itemhandlers/Book.java | 2 +- .../handler/itemhandlers/BreakingArrow.java | 2 +- .../itemhandlers/CharChangePotions.java | 2 +- .../handler/itemhandlers/ChestKey.java | 2 +- .../handler/itemhandlers/ChristmasTree.java | 2 +- .../CompBlessedSpiritShotPacks.java | 2 +- .../handler/itemhandlers/CompShotPacks.java | 2 +- .../itemhandlers/CompSpiritShotPacks.java | 2 +- .../handler/itemhandlers/CrystalCarol.java | 2 +- .../handler/itemhandlers/Crystals.java | 2 +- .../handler/itemhandlers/CustomPotions.java | 2 +- .../handler/itemhandlers/EnchantScrolls.java | 2 +- .../handler/itemhandlers/EnergyStone.java | 2 +- .../itemhandlers/ExtractableItems.java | 2 +- .../handler/itemhandlers/Firework.java | 2 +- .../handler/itemhandlers/FishShots.java | 8 +- .../handler/itemhandlers/Harvester.java | 2 +- .../handler/itemhandlers/HeroCustomItem.java | 2 +- .../handler/itemhandlers/JackpotSeed.java | 2 +- .../handler/itemhandlers/MOSKey.java | 2 +- .../itemhandlers/MapForestOfTheDead.java | 2 +- .../gameserver/handler/itemhandlers/Maps.java | 2 +- .../handler/itemhandlers/MercTicket.java | 2 +- .../handler/itemhandlers/MysteryPotion.java | 2 +- .../handler/itemhandlers/Nectar.java | 2 +- .../handler/itemhandlers/NobleCustomItem.java | 2 +- .../handler/itemhandlers/PaganKeys.java | 2 +- .../handler/itemhandlers/Potions.java | 2 +- .../handler/itemhandlers/Recipes.java | 2 +- .../handler/itemhandlers/Remedy.java | 2 +- .../handler/itemhandlers/RollingDice.java | 2 +- .../handler/itemhandlers/ScrollOfEscape.java | 2 +- .../itemhandlers/ScrollOfResurrection.java | 2 +- .../handler/itemhandlers/Scrolls.java | 2 +- .../gameserver/handler/itemhandlers/Seed.java | 2 +- .../itemhandlers/SevenSignsRecord.java | 2 +- .../handler/itemhandlers/SoulCrystals.java | 2 +- .../handler/itemhandlers/SoulShots.java | 6 +- .../handler/itemhandlers/SpecialXMas.java | 2 +- .../handler/itemhandlers/SpiritShot.java | 6 +- .../handler/itemhandlers/SummonItems.java | 2 +- .../handler/skillhandlers/Blow.java | 4 +- .../handler/skillhandlers/Fishing.java | 6 +- .../handler/skillhandlers/FishingSkill.java | 6 +- .../handler/skillhandlers/Harvest.java | 2 +- .../handler/skillhandlers/Pdam.java | 4 +- .../gameserver/handler/skillhandlers/Sow.java | 2 +- .../skillhandlers/StrSiegeAssault.java | 4 +- .../handler/skillhandlers/Sweep.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/ChristmasManager.java | 2 +- .../instancemanager/CrownManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../DimensionalRiftManager.java | 2 +- .../FourSepulchersManager.java | 2 +- .../instancemanager/ItemsOnGroundManager.java | 4 +- .../instancemanager/MercTicketManager.java | 2 +- .../instancemanager/RebirthManager.java | 2 +- .../instancemanager/RecipeManager.java | 2 +- .../instancemanager/TradeManager.java | 2 +- .../instancemanager/games/Lottery.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/Augmentation.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 4 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../gameserver/model/StoreTradeList.java | 2 +- .../l2jmobius/gameserver/model/TradeList.java | 6 +- .../gameserver/model/WorldObject.java | 2 +- .../gameserver/model/actor/Attackable.java | 6 +- .../gameserver/model/actor/Creature.java | 6 +- .../l2jmobius/gameserver/model/actor/Npc.java | 8 +- .../gameserver/model/actor/Player.java | 16 +- .../gameserver/model/actor/Summon.java | 4 +- .../model/actor/instance/BabyPet.java | 2 +- .../gameserver/model/actor/instance/Boat.java | 4 +- .../model/actor/instance/ClassMaster.java | 2 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/FakePlayer.java | 2 +- .../model/actor/instance/FestivalGuide.java | 2 +- .../model/actor/instance/FestivalMonster.java | 2 +- .../actor/instance/FortWyvernManager.java | 2 +- .../model/actor/instance/ManorManager.java | 2 +- .../model/actor/instance/OlympiadManager.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/SepulcherNpc.java | 2 +- .../model/actor/instance/SignsPriest.java | 2 +- .../model/actor/instance/TamedBeast.java | 2 +- .../model/actor/instance/WeddingManager.java | 2 +- .../actor/knownlist/PlayerKnownList.java | 2 +- .../model/{items => item}/Armor.java | 6 +- .../model/{items => item}/EtcItem.java | 4 +- .../model/{items => item}/Henna.java | 2 +- .../model/{items => item}/ItemTemplate.java | 6 +- .../model/{items => item}/Weapon.java | 6 +- .../model/{items => item}/instance/Item.java | 10 +- .../model/{items => item}/type/ArmorType.java | 2 +- .../model/item}/type/EtcItemType.java | 2 +- .../model/{items => item}/type/ItemType.java | 2 +- .../{items => item}/type/WeaponType.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 6 +- .../model/itemcontainer/PetInventory.java | 2 +- .../model/itemcontainer/PlayerFreight.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 8 +- .../model/itemcontainer/PlayerWarehouse.java | 2 +- .../gameserver/model/olympiad/Hero.java | 4 +- .../model/olympiad/OlympiadGame.java | 2 +- .../gameserver/model/quest/QuestState.java | 2 +- .../model/sevensigns/SevenSignsFestival.java | 2 +- .../clanhalls/BanditStrongholdSiege.java | 2 +- .../siege/clanhalls/WildBeastFarmSiege.java | 2 +- .../gameserver/model/skills/Env.java | 2 +- .../gameserver/model/skills/Formulas.java | 10 +- .../conditions/ConditionSlotItemId.java | 2 +- .../conditions/ConditionSlotItemType.java | 2 +- .../conditions/ConditionTargetBodyPart.java | 4 +- .../ConditionTargetUsesWeaponKind.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/skills/funcs/FuncEnchant.java | 6 +- .../model/skills/handlers/SkillChargeDmg.java | 4 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../gameserver/model/zone/type/BossZone.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/MultiSellChoose.java | 8 +- .../clientpackets/RequestAquireSkill.java | 2 +- .../clientpackets/RequestAutoSoulShot.java | 2 +- .../network/clientpackets/RequestBuyItem.java | 2 +- .../clientpackets/RequestBuyProcure.java | 4 +- .../network/clientpackets/RequestBuySeed.java | 4 +- .../clientpackets/RequestChangePetName.java | 2 +- .../RequestConfirmCancelItem.java | 4 +- .../clientpackets/RequestConfirmGemStone.java | 4 +- .../RequestConfirmRefinerItem.java | 4 +- .../RequestConfirmTargetItem.java | 4 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 6 +- .../clientpackets/RequestEnchantItem.java | 6 +- .../clientpackets/RequestExEnchantSkill.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 4 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 4 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPrivateStoreBuy.java | 2 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../clientpackets/RequestRecordInfo.java | 2 +- .../network/clientpackets/RequestRefine.java | 4 +- .../clientpackets/RequestRefineCancel.java | 4 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 4 +- .../clientpackets/RequestWearItem.java | 4 +- .../SendWareHouseDepositList.java | 4 +- .../SendWareHouseWithDrawList.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- .../network/serverpackets/BuyList.java | 4 +- .../network/serverpackets/BuyListSeed.java | 2 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EquipUpdate.java | 4 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../serverpackets/GMViewHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 6 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../network/serverpackets/HennaItemInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../network/serverpackets/SellList.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/TradeStart.java | 2 +- .../network/serverpackets/TradeUpdate.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../network/serverpackets/WearList.java | 4 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 4 +- .../gameserver/util/DocumentBase.java | 8 +- .../gameserver/util/DocumentItem.java | 14 +- .../org/l2jmobius/log/filter/ItemFilter.java | 4 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../l2jmobius/telnet/GameStatusThread.java | 2 +- .../ai/areas/PrimevalIsle/PrimevalIsle.java | 2 +- .../ai/others/AvantGarde/AvantGarde.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../SubclassCertification.java | 2 +- .../TerritoryManagers/TerritoryManagers.java | 2 +- .../RainbowSpringsChateau.java | 4 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../custom/Validators/SubClassSkills.java | 2 +- .../custom/events/Wedding/Wedding.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 2 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 2 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Festival.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../scripts/handlers/bypasshandlers/Loto.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../handlers/effecthandlers/Fishing.java | 8 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/Pumping.java | 4 +- .../handlers/effecthandlers/Reeling.java | 4 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 2 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../handlers/itemhandlers/BeastSpice.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../handlers/itemhandlers/Disguise.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../itemhandlers/SevenSignsRecord.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../itemhandlers/TeleportBookmark.java | 2 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../CrystalCaverns/CrystalCaverns.java | 2 +- .../Q00212_TrialOfDuty.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00335_TheSongOfTheHunter.java | 2 +- .../Q00350_EnhanceYourWeapon.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 4 +- .../Q00421_LittleWingsBigAdventure.java | 2 +- .../Q00422_RepentYourSins.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 6 +- .../gameserver/data/AugmentationData.java | 4 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../DimensionalRiftManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../FourSepulchersManager.java | 2 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/MercTicketManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../instancemanager/games/Lottery.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 4 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../gameserver/model/TerritoryWard.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 8 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../gameserver/model/actor/Player.java | 20 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/BabyPet.java | 2 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/FestivalMonster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/SepulcherNpc.java | 2 +- .../model/actor/instance/SignsPriest.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/stat/CreatureStat.java | 4 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../conditions/ConditionPlayerCanSummon.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../conditions/ConditionTargetAbnormal.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/events/AbstractScript.java | 6 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../player/clanwh/OnPlayerClanWHItemAdd.java | 2 +- .../clanwh/OnPlayerClanWHItemDestroy.java | 2 +- .../clanwh/OnPlayerClanWHItemTransfer.java | 2 +- .../player/inventory/OnPlayerItemAdd.java | 2 +- .../player/inventory/OnPlayerItemDestroy.java | 2 +- .../player/inventory/OnPlayerItemDrop.java | 2 +- .../player/inventory/OnPlayerItemPickup.java | 2 +- .../inventory/OnPlayerItemTransfer.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../model/holders/PrimeShopProductHolder.java | 2 +- .../model/{items => item}/Armor.java | 4 +- .../model/{items => item}/EtcItem.java | 4 +- .../model/{items => item}/Henna.java | 2 +- .../model/{items => item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../model/{items => item}/WarehouseItem.java | 8 +- .../model/{items => item}/Weapon.java | 4 +- .../item}/enchant/AbstractEnchantItem.java | 12 +- .../enchant/EnchantItemGroup.java | 2 +- .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../enchant/EnchantScroll.java | 8 +- .../enchant/EnchantScrollGroup.java | 4 +- .../enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/item}/instance/Item.java | 14 +- .../{items => item}/type/ActionType.java | 2 +- .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item}/type/CrystalType.java | 2 +- .../{items => item}/type/EtcItemType.java | 2 +- .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../{items => item}/type/WeaponType.java | 2 +- .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 8 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 4 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../model/items/PlayerItemTemplate.java | 45 - .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../model/items/type/ArmorType.java | 51 - .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/multisell/Ingredient.java | 8 +- .../gameserver/model/multisell/ItemInfo.java | 2 +- .../model/multisell/PreparedEntry.java | 2 +- .../multisell/PreparedListContainer.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../model/olympiad/OlympiadGame.java | 2 +- .../gameserver/model/options/Options.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/sevensigns/SevenSignsFestival.java | 2 +- .../gameserver/model/stats/Formulas.java | 10 +- .../model/stats/functions/FuncEnchant.java | 6 +- .../model/stats/functions/FuncEnchantHp.java | 2 +- .../model/stats/functions/FuncTemplate.java | 2 +- .../functions/formulas/FuncArmorSet.java | 2 +- .../stats/functions/formulas/FuncPDefMod.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 10 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 2 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 2 +- .../clientpackets/RequestAutoSoulShot.java | 2 +- .../clientpackets/RequestBrBuyProduct.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 4 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 6 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExEnchantItemAttribute.java | 2 +- .../clientpackets/RequestExEnchantSkill.java | 2 +- .../RequestExEnchantSkillRouteChange.java | 2 +- .../RequestExEnchantSkillSafe.java | 2 +- .../RequestExEnchantSkillUntrain.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../RequestPackageSendableItemList.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../network/clientpackets/UseItem.java | 12 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 2 +- .../network/serverpackets/BuyList.java | 2 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EquipUpdate.java | 4 +- .../network/serverpackets/ExBuySellList.java | 4 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 4 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../SortedWareHouseWithdrawalList.java | 12 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../ai/areas/PrimevalIsle/PrimevalIsle.java | 2 +- .../ai/others/AvantGarde/AvantGarde.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../SubclassCertification.java | 2 +- .../TerritoryManagers/TerritoryManagers.java | 2 +- .../RainbowSpringsChateau.java | 4 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../custom/Validators/SubClassSkills.java | 2 +- .../custom/events/Wedding/Wedding.java | 2 +- .../features/SkillTransfer/SkillTransfer.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 2 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 2 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Festival.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../scripts/handlers/bypasshandlers/Loto.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 4 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 4 +- .../handlers/effecthandlers/Fishing.java | 8 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/Pumping.java | 4 +- .../handlers/effecthandlers/Reeling.java | 4 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 2 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../handlers/itemhandlers/Disguise.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../itemhandlers/SevenSignsRecord.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../itemhandlers/TeleportBookmark.java | 2 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../CrystalCaverns/CrystalCaverns.java | 2 +- .../Q00212_TrialOfDuty.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00335_TheSongOfTheHunter.java | 2 +- .../Q00350_EnhanceYourWeapon.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 4 +- .../Q00421_LittleWingsBigAdventure.java | 2 +- .../Q00422_RepentYourSins.java | 2 +- .../Q00456_DontKnowDontCare.java | 2 +- .../quests/Q00464_Oath/Q00464_Oath.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 6 +- .../gameserver/data/AugmentationData.java | 4 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../DimensionalRiftManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../FourSepulchersManager.java | 2 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/MercTicketManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../instancemanager/games/Lottery.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 4 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../gameserver/model/TerritoryWard.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 8 +- .../l2jmobius/gameserver/model/actor/Npc.java | 6 +- .../gameserver/model/actor/Player.java | 20 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/BabyPet.java | 2 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/FestivalMonster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/SepulcherNpc.java | 2 +- .../model/actor/instance/SignsPriest.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/stat/CreatureStat.java | 4 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../conditions/ConditionPlayerCanSummon.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../conditions/ConditionTargetAbnormal.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/events/AbstractScript.java | 6 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../player/clanwh/OnPlayerClanWHItemAdd.java | 2 +- .../clanwh/OnPlayerClanWHItemDestroy.java | 2 +- .../clanwh/OnPlayerClanWHItemTransfer.java | 2 +- .../player/inventory/OnPlayerItemAdd.java | 2 +- .../player/inventory/OnPlayerItemDestroy.java | 2 +- .../player/inventory/OnPlayerItemDrop.java | 2 +- .../player/inventory/OnPlayerItemPickup.java | 2 +- .../inventory/OnPlayerItemTransfer.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../model/holders/PrimeShopProductHolder.java | 2 +- .../model/{items => item}/Armor.java | 4 +- .../model/{items => item}/EtcItem.java | 4 +- .../model/{items => item}/Henna.java | 2 +- .../model/{items => item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../model/{items => item}/WarehouseItem.java | 8 +- .../model/{items => item}/Weapon.java | 4 +- .../item}/enchant/AbstractEnchantItem.java | 12 +- .../enchant/EnchantItemGroup.java | 2 +- .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../enchant/EnchantScroll.java | 8 +- .../enchant/EnchantScrollGroup.java | 4 +- .../enchant/EnchantSupportItem.java | 4 +- .../gameserver/model/item}/instance/Item.java | 14 +- .../{items => item}/type/ActionType.java | 2 +- .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item}/type/CrystalType.java | 2 +- .../{items => item}/type/EtcItemType.java | 2 +- .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../{items => item}/type/WeaponType.java | 2 +- .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 8 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 4 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../model/items/PlayerItemTemplate.java | 45 - .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../model/items/type/ArmorType.java | 51 - .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/multisell/Ingredient.java | 8 +- .../gameserver/model/multisell/ItemInfo.java | 2 +- .../model/multisell/PreparedEntry.java | 2 +- .../multisell/PreparedListContainer.java | 2 +- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/options/Options.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/sevensigns/SevenSignsFestival.java | 2 +- .../gameserver/model/stats/Formulas.java | 10 +- .../model/stats/functions/FuncEnchant.java | 6 +- .../model/stats/functions/FuncEnchantHp.java | 2 +- .../model/stats/functions/FuncTemplate.java | 2 +- .../functions/formulas/FuncArmorSet.java | 2 +- .../stats/functions/formulas/FuncPDefMod.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 10 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 2 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 2 +- .../clientpackets/RequestAcquireSkill.java | 2 +- .../clientpackets/RequestAutoSoulShot.java | 2 +- .../clientpackets/RequestBrBuyProduct.java | 2 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 4 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 6 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExEnchantItemAttribute.java | 2 +- .../clientpackets/RequestExEnchantSkill.java | 2 +- .../RequestExEnchantSkillRouteChange.java | 2 +- .../RequestExEnchantSkillSafe.java | 2 +- .../RequestExEnchantSkillUntrain.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../RequestPackageSendableItemList.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../network/clientpackets/UseItem.java | 12 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 2 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EquipUpdate.java | 4 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 4 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../SortedWareHouseWithdrawalList.java | 12 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../events/SquashEvent/SquashEvent.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../effecthandlers/CrystalGradeModify.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../handlers/effecthandlers/VipUp.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 6 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q00212_TrialOfDuty.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00255_Tutorial/Q00255_Tutorial.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 4 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 20 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../gameserver/model/item/Armor.java | 87 ++ .../gameserver/model/item/EtcItem.java | 156 +++ .../model/{items => item}/Henna.java | 2 +- .../gameserver/model/item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../gameserver/model/item}/WarehouseItem.java | 8 +- .../gameserver/model/item/Weapon.java | 311 +++++ .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../item/appearance/AppearanceStone.java | 558 +++++++++ .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../item/combination/CombinationItem.java | 65 + .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../item}/enchant/AbstractEnchantItem.java | 12 +- .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../model/item}/enchant/EnchantScroll.java | 10 +- .../item/enchant/EnchantScrollGroup.java | 82 ++ .../enchant/EnchantSupportItem.java | 6 +- .../enchant/attribute/AttributeHolder.java | 60 + .../gameserver/model/item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../{items => item}/type/CrystalType.java | 2 +- .../{items => item}/type/EtcItemType.java | 2 +- .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/Armor.java | 87 -- .../gameserver/model/items/EtcItem.java | 156 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/Weapon.java | 311 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../items/appearance/AppearanceStone.java | 558 --------- .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../items/combination/CombinationItem.java | 65 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../model/items/enchant/EnchantItemGroup.java | 97 -- .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../items/enchant/EnchantScrollGroup.java | 82 -- .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 2 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../vip/ReceiveVipLuckyGameInfo.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../events/SquashEvent/SquashEvent.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../effecthandlers/CrystalGradeModify.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../handlers/effecthandlers/VipUp.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 6 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q00212_TrialOfDuty.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00255_Tutorial/Q00255_Tutorial.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 4 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 20 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../gameserver/model/item/Armor.java | 87 ++ .../gameserver/model/item/EtcItem.java | 156 +++ .../model/{items => item}/Henna.java | 2 +- .../gameserver/model/item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../gameserver/model/item/WarehouseItem.java | 300 +++++ .../gameserver/model/item/Weapon.java | 311 +++++ .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../item/appearance/AppearanceStone.java | 558 +++++++++ .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../item/combination/CombinationItem.java | 65 + .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../item/enchant/AbstractEnchantItem.java | 210 ++++ .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../model/item}/enchant/EnchantScroll.java | 10 +- .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item/enchant/EnchantSupportItem.java | 57 + .../enchant/attribute/AttributeHolder.java | 60 + .../gameserver/model/item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item/type/CrystalType.java | 88 ++ .../model/item/type/EtcItemType.java | 105 ++ .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/Armor.java | 87 -- .../gameserver/model/items/EtcItem.java | 156 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/WarehouseItem.java | 300 ----- .../gameserver/model/items/Weapon.java | 311 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../items/appearance/AppearanceStone.java | 558 --------- .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../items/combination/CombinationItem.java | 65 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../items/enchant/AbstractEnchantItem.java | 210 ---- .../model/items/enchant/EnchantItemGroup.java | 97 -- .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../items/enchant/EnchantScrollGroup.java | 82 -- .../items/enchant/EnchantSupportItem.java | 57 - .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../model/items/type/CrystalType.java | 88 -- .../model/items/type/EtcItemType.java | 105 -- .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 2 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../vip/ReceiveVipLuckyGameInfo.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../events/SquashEvent/SquashEvent.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../effecthandlers/CrystalGradeModify.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../handlers/effecthandlers/VipUp.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 6 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q00212_TrialOfDuty.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00255_Tutorial/Q00255_Tutorial.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 4 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 20 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../model/{items => item}/Armor.java | 4 +- .../gameserver/model/item/EtcItem.java | 156 +++ .../model/{items => item}/Henna.java | 2 +- .../model/{items => item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../gameserver/model/item/WarehouseItem.java | 300 +++++ .../gameserver/model/item/Weapon.java | 311 +++++ .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../item/appearance/AppearanceStone.java | 558 +++++++++ .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../item/combination/CombinationItem.java | 65 + .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../item/enchant/AbstractEnchantItem.java | 210 ++++ .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../enchant/EnchantScroll.java | 10 +- .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item/enchant/EnchantSupportItem.java | 57 + .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item/type/CrystalType.java | 88 ++ .../model/item/type/EtcItemType.java | 105 ++ .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/EtcItem.java | 156 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/WarehouseItem.java | 300 ----- .../gameserver/model/items/Weapon.java | 311 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../items/appearance/AppearanceStone.java | 558 --------- .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../items/combination/CombinationItem.java | 65 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../items/enchant/AbstractEnchantItem.java | 210 ---- .../model/items/enchant/EnchantItemGroup.java | 97 -- .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../items/enchant/EnchantScrollGroup.java | 82 -- .../items/enchant/EnchantSupportItem.java | 57 - .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../model/items/type/CrystalType.java | 88 -- .../model/items/type/EtcItemType.java | 105 -- .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../network/clientpackets/AddTradeItem.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 4 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../vip/ReceiveVipLuckyGameInfo.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../events/SquashEvent/SquashEvent.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../effecthandlers/CrystalGradeModify.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../handlers/effecthandlers/VipUp.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/AddSpiritExp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 6 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q00212_TrialOfDuty.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00255_Tutorial/Q00255_Tutorial.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 4 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 20 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../gameserver/model/item}/Armor.java | 4 +- .../gameserver/model/item/EtcItem.java | 156 +++ .../model/{items => item}/Henna.java | 2 +- .../gameserver/model/item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../gameserver/model/item/WarehouseItem.java | 300 +++++ .../gameserver/model/item/Weapon.java | 311 +++++ .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../item/appearance/AppearanceStone.java | 558 +++++++++ .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../item/combination/CombinationItem.java | 65 + .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../item/enchant/AbstractEnchantItem.java | 210 ++++ .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../enchant/EnchantScroll.java | 10 +- .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item/enchant/EnchantSupportItem.java | 57 + .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item/type/CrystalType.java | 88 ++ .../model/item/type/EtcItemType.java | 105 ++ .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/EtcItem.java | 156 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/WarehouseItem.java | 300 ----- .../gameserver/model/items/Weapon.java | 311 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../items/appearance/AppearanceStone.java | 558 --------- .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../items/combination/CombinationItem.java | 65 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../items/enchant/AbstractEnchantItem.java | 210 ---- .../model/items/enchant/EnchantItemGroup.java | 97 -- .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../items/enchant/EnchantScrollGroup.java | 82 -- .../items/enchant/EnchantSupportItem.java | 57 - .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../model/items/type/CrystalType.java | 88 -- .../model/items/type/EtcItemType.java | 105 -- .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../network/clientpackets/AddTradeItem.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 4 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../vip/ReceiveVipLuckyGameInfo.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../events/SquashEvent/SquashEvent.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../effecthandlers/CrystalGradeModify.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../handlers/effecthandlers/VipUp.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/AddSpiritExp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 6 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q00212_TrialOfDuty.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00255_Tutorial/Q00255_Tutorial.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 4 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 20 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../gameserver/model/item/Armor.java | 92 ++ .../gameserver/model/item/EtcItem.java | 156 +++ .../gameserver/model/item/Henna.java | 171 +++ .../gameserver/model/item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../gameserver/model/item/WarehouseItem.java | 300 +++++ .../gameserver/model/item/Weapon.java | 311 +++++ .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../item/appearance/AppearanceStone.java | 558 +++++++++ .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../item/combination/CombinationItem.java | 65 + .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../item/enchant/AbstractEnchantItem.java | 210 ++++ .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../model/item/enchant/EnchantScroll.java | 229 ++++ .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item/enchant/EnchantSupportItem.java | 57 + .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item/type/CrystalType.java | 88 ++ .../model/item/type/EtcItemType.java | 105 ++ .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/Armor.java | 92 -- .../gameserver/model/items/EtcItem.java | 156 --- .../gameserver/model/items/Henna.java | 171 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/WarehouseItem.java | 300 ----- .../gameserver/model/items/Weapon.java | 311 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../items/appearance/AppearanceStone.java | 558 --------- .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../items/combination/CombinationItem.java | 65 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../items/enchant/AbstractEnchantItem.java | 210 ---- .../model/items/enchant/EnchantItemGroup.java | 97 -- .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../model/items/enchant/EnchantScroll.java | 229 ---- .../items/enchant/EnchantScrollGroup.java | 82 -- .../items/enchant/EnchantSupportItem.java | 57 - .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../model/items/type/CrystalType.java | 88 -- .../model/items/type/EtcItemType.java | 105 -- .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../network/clientpackets/AddTradeItem.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 4 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../RequestUpgradeSystemResult.java | 4 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../network/serverpackets/ExItemAnnounce.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../vip/ReceiveVipLuckyGameInfo.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../DimensionalMerchant.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../events/SquashEvent/SquashEvent.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../effecthandlers/AddHuntingTime.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../handlers/effecthandlers/VipUp.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/AddSpiritExp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 4 +- .../itemhandlers/BlessedSpiritShot.java | 4 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 4 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 4 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 20 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../gameserver/model/item/Armor.java | 92 ++ .../gameserver/model/item/EtcItem.java | 156 +++ .../gameserver/model/item/Henna.java | 171 +++ .../gameserver/model/item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../gameserver/model/item/WarehouseItem.java | 300 +++++ .../gameserver/model/item/Weapon.java | 311 +++++ .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../item/appearance/AppearanceStone.java | 558 +++++++++ .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../item/combination/CombinationItem.java | 65 + .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../item/enchant/AbstractEnchantItem.java | 210 ++++ .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../model/item/enchant/EnchantScroll.java | 229 ++++ .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item/enchant/EnchantSupportItem.java | 57 + .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item/type/CrystalType.java | 88 ++ .../model/item/type/EtcItemType.java | 105 ++ .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/Armor.java | 92 -- .../gameserver/model/items/EtcItem.java | 156 --- .../gameserver/model/items/Henna.java | 171 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/WarehouseItem.java | 300 ----- .../gameserver/model/items/Weapon.java | 311 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../items/appearance/AppearanceStone.java | 558 --------- .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../items/combination/CombinationItem.java | 65 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../items/enchant/AbstractEnchantItem.java | 210 ---- .../model/items/enchant/EnchantItemGroup.java | 97 -- .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../model/items/enchant/EnchantScroll.java | 229 ---- .../items/enchant/EnchantScrollGroup.java | 82 -- .../items/enchant/EnchantSupportItem.java | 57 - .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../model/items/type/CrystalType.java | 88 -- .../model/items/type/EtcItemType.java | 105 -- .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../network/clientpackets/AddTradeItem.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 4 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../ExRequestActivateAutoShortcut.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../RequestUpgradeSystemResult.java | 4 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../network/serverpackets/ExDieInfo.java | 2 +- .../network/serverpackets/ExItemAnnounce.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../vip/ReceiveVipLuckyGameInfo.java | 2 +- .../taskmanager/AutoPlayTaskManager.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../taskmanager/AutoUseTaskManager.java | 6 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../ai/areas/PrimevalIsle/PrimevalIsle.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../events/SquashEvent/SquashEvent.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../scripts/handlers/bypasshandlers/Loto.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AirBind.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../effecthandlers/CrystalGradeModify.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../handlers/effecthandlers/DisableSkill.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/Recovery.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 6 +- .../effecthandlers/RestorationRandom.java | 6 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 6 +- .../itemhandlers/BlessedSpiritShot.java | 6 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 6 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 6 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 6 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q00212_TrialOfDuty.java | 2 +- .../Q00229_TestOfWitchcraft.java | 2 +- .../Q00255_Tutorial/Q00255_Tutorial.java | 2 +- .../Q00350_EnhanceYourWeapon.java | 2 +- .../Q00401_PathOfTheWarrior.java | 2 +- .../Q00403_PathOfTheRogue.java | 2 +- .../Q00415_PathOfTheOrcMonk.java | 4 +- .../Q00421_LittleWingsBigAdventure.java | 2 +- .../java/org/l2jmobius/Config.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 10 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 4 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../gameserver/data/xml/MultisellData.java | 6 +- .../gameserver/data/xml/NpcData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/RecipeData.java | 4 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../instancemanager/games/Lottery.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 20 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerGrade.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../gameserver/model/item/Armor.java | 87 ++ .../gameserver/model/item/EtcItem.java | 156 +++ .../gameserver/model/item/Henna.java | 171 +++ .../gameserver/model/item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../model/{items => item}/WarehouseItem.java | 8 +- .../gameserver/model/item/Weapon.java | 311 +++++ .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../item/appearance/AppearanceStone.java | 558 +++++++++ .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../item/combination/CombinationItem.java | 65 + .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../item/enchant/AbstractEnchantItem.java | 210 ++++ .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../model/item/enchant/EnchantScroll.java | 229 ++++ .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item/enchant/EnchantSupportItem.java | 57 + .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item/type/CrystalType.java | 88 ++ .../model/item/type/EtcItemType.java | 105 ++ .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 16 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 6 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/Armor.java | 87 -- .../gameserver/model/items/EtcItem.java | 156 --- .../gameserver/model/items/Henna.java | 171 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/Weapon.java | 311 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../items/appearance/AppearanceStone.java | 558 --------- .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../items/combination/CombinationItem.java | 65 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../items/enchant/AbstractEnchantItem.java | 210 ---- .../model/items/enchant/EnchantItemGroup.java | 97 -- .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../model/items/enchant/EnchantScroll.java | 229 ---- .../items/enchant/EnchantScrollGroup.java | 82 -- .../items/enchant/EnchantSupportItem.java | 57 - .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../model/items/type/CrystalType.java | 88 -- .../model/items/type/EtcItemType.java | 105 -- .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 2 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestGetItemFromPet.java | 2 +- .../clientpackets/RequestGiveItemToPet.java | 2 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPetGetItem.java | 2 +- .../clientpackets/RequestPetUseItem.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 10 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../serverpackets/PetInventoryUpdate.java | 2 +- .../network/serverpackets/PetItemList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../others/GameAssistant/GameAssistant.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../events/SquashEvent/SquashEvent.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../effecthandlers/AddHuntingTime.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../effecthandlers/ModifyCraftPoints.java | 2 +- .../effecthandlers/ModifyDeathPoints.java | 2 +- .../effecthandlers/ModifyMagicLampPoints.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../effecthandlers/SayhaGraceSupport.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../handlers/effecthandlers/VipUp.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/AddSpiritExp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 4 +- .../itemhandlers/BlessedSpiritShot.java | 4 +- .../itemhandlers/BlessingScrolls.java | 2 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../handlers/itemhandlers/LimitedSayha.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 4 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 4 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q10971_TalismanEnchant.java | 2 +- .../Q10973_EnchantingAgathions.java | 2 +- .../Q10974_NewStylishEquipment.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 12 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../data/xml/LimitShopCraftData.java | 2 +- .../gameserver/data/xml/LimitShopData.java | 2 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/RandomCraftData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 18 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../model/{items => item}/Armor.java | 4 +- .../gameserver/model/item/EtcItem.java | 156 +++ .../gameserver/model/item/Henna.java | 171 +++ .../gameserver/model/item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../model/{items => item}/WarehouseItem.java | 8 +- .../gameserver/model/item/Weapon.java | 311 +++++ .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../item/appearance/AppearanceStone.java | 558 +++++++++ .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../item/combination/CombinationItem.java | 65 + .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../enchant/AbstractEnchantItem.java | 12 +- .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../enchant/EnchantScroll.java | 10 +- .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item/enchant/EnchantSupportItem.java | 57 + .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item/type/CrystalType.java | 88 ++ .../{items => item}/type/EtcItemType.java | 2 +- .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../model/item/type/WeaponType.java | 91 ++ .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 14 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 8 +- .../itemcontainer/PlayerRandomCraft.java | 2 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/EtcItem.java | 156 --- .../gameserver/model/items/Henna.java | 171 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/Weapon.java | 311 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../items/appearance/AppearanceStone.java | 558 --------- .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../items/combination/CombinationItem.java | 65 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../model/items/enchant/EnchantItemGroup.java | 97 -- .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../items/enchant/EnchantScrollGroup.java | 82 -- .../items/enchant/EnchantSupportItem.java | 57 - .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../model/items/type/CrystalType.java | 88 -- .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/items/type/WeaponType.java | 91 -- .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../network/clientpackets/AddTradeItem.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 6 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 8 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../ExRequestActivateAutoShortcut.java | 2 +- .../blessing/RequestBlessOptionEnchant.java | 4 +- .../blessing/RequestBlessOptionPutItem.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../RequestUpgradeSystemResult.java | 4 +- .../RequestPurchaseLimitShopItemBuy.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../clientpackets/pet/ExEvolvePet.java | 2 +- .../clientpackets/pet/ExPetEquipItem.java | 4 +- .../clientpackets/pet/ExPetUnequipItem.java | 4 +- .../pet/RequestGetItemFromPet.java | 2 +- .../pet/RequestGiveItemToPet.java | 2 +- .../clientpackets/pet/RequestPetGetItem.java | 2 +- .../clientpackets/pet/RequestPetUseItem.java | 2 +- .../ExRequestRandomCraftExtract.java | 2 +- .../ExRequestRandomCraftLockSlot.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../network/serverpackets/ExDieInfo.java | 2 +- .../network/serverpackets/ExItemAnnounce.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../serverpackets/pet/PetInventoryUpdate.java | 2 +- .../serverpackets/pet/PetItemList.java | 2 +- .../vip/ReceiveVipLuckyGameInfo.java | 2 +- .../taskmanager/AutoPlayTaskManager.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../taskmanager/AutoUseTaskManager.java | 6 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../others/GameAssistant/GameAssistant.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../events/SquashEvent/SquashEvent.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../effecthandlers/AddHuntingTime.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveHonorCoins.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../effecthandlers/ModifyCraftPoints.java | 2 +- .../effecthandlers/ModifyDeathPoints.java | 2 +- .../effecthandlers/ModifyMagicLampPoints.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../effecthandlers/SayhaGraceSupport.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByDualRange.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../handlers/effecthandlers/VipUp.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/AddSpiritExp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 4 +- .../itemhandlers/BlessedSpiritShot.java | 4 +- .../itemhandlers/BlessingScrolls.java | 2 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../handlers/itemhandlers/LimitedSayha.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 4 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 4 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q10971_TalismanEnchant.java | 2 +- .../Q10973_EnchantingAgathions.java | 2 +- .../Q10974_NewStylishEquipment.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 12 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../gameserver/data/xml/CollectionData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../data/xml/LimitShopCraftData.java | 2 +- .../gameserver/data/xml/LimitShopData.java | 2 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/RandomCraftData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 18 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../gameserver/model/item/Armor.java | 92 ++ .../gameserver/model/item/EtcItem.java | 156 +++ .../gameserver/model/item/Henna.java | 171 +++ .../gameserver/model/item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../model/{items => item}/WarehouseItem.java | 8 +- .../gameserver/model/item/Weapon.java | 311 +++++ .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../item/appearance/AppearanceStone.java | 558 +++++++++ .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../combination/CombinationItem.java | 2 +- .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../enchant/AbstractEnchantItem.java | 12 +- .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../enchant/EnchantScroll.java | 10 +- .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item/enchant/EnchantSupportItem.java | 57 + .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item/type/CrystalType.java | 88 ++ .../{items => item}/type/EtcItemType.java | 2 +- .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../{items => item}/type/WeaponType.java | 2 +- .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 14 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 8 +- .../itemcontainer/PlayerRandomCraft.java | 2 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/Armor.java | 92 -- .../gameserver/model/items/EtcItem.java | 156 --- .../gameserver/model/items/Henna.java | 171 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/Weapon.java | 311 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../items/appearance/AppearanceStone.java | 558 --------- .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../model/items/enchant/EnchantItemGroup.java | 97 -- .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../items/enchant/EnchantScrollGroup.java | 82 -- .../items/enchant/EnchantSupportItem.java | 57 - .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../model/items/type/CrystalType.java | 88 -- .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../network/clientpackets/AddTradeItem.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 6 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 10 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../ExRequestActivateAutoShortcut.java | 2 +- .../blessing/RequestBlessOptionEnchant.java | 4 +- .../blessing/RequestBlessOptionPutItem.java | 2 +- .../collection/RequestCollectionRegister.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../RequestUpgradeSystemResult.java | 4 +- .../RequestPurchaseLimitShopItemBuy.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../clientpackets/pet/ExEvolvePet.java | 2 +- .../clientpackets/pet/ExPetEquipItem.java | 4 +- .../clientpackets/pet/ExPetUnequipItem.java | 4 +- .../pet/RequestGetItemFromPet.java | 2 +- .../pet/RequestGiveItemToPet.java | 2 +- .../clientpackets/pet/RequestPetGetItem.java | 2 +- .../clientpackets/pet/RequestPetUseItem.java | 2 +- .../ExRequestRandomCraftExtract.java | 2 +- .../ExRequestRandomCraftLockSlot.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../network/serverpackets/ExDieInfo.java | 2 +- .../network/serverpackets/ExItemAnnounce.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../collection/ExCollectionRegister.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../serverpackets/pet/PetInventoryUpdate.java | 2 +- .../serverpackets/pet/PetItemList.java | 2 +- .../vip/ReceiveVipLuckyGameInfo.java | 2 +- .../taskmanager/AutoPlayTaskManager.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../taskmanager/AutoUseTaskManager.java | 6 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- .../others/GameAssistant/GameAssistant.java | 2 +- .../data/scripts/ai/others/SiegeGuards.java | 2 +- .../scripts/custom/SellBuff/SellBuff.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 2 +- .../events/SquashEvent/SquashEvent.java | 2 +- .../actionshifthandlers/ItemActionShift.java | 2 +- .../admincommandhandlers/AdminCreateItem.java | 4 +- .../AdminDestroyItems.java | 2 +- .../admincommandhandlers/AdminElement.java | 4 +- .../admincommandhandlers/AdminEnchant.java | 2 +- .../bypasshandlers/ClanWarehouse.java | 2 +- .../handlers/bypasshandlers/Freight.java | 2 +- .../handlers/bypasshandlers/NpcViewMod.java | 2 +- .../communityboard/DropSearchBoard.java | 2 +- .../effecthandlers/AbnormalShield.java | 2 +- .../effecthandlers/AbnormalTimeChange.java | 2 +- .../handlers/effecthandlers/AbsorbDamage.java | 2 +- .../AbstractConditionalHpEffect.java | 2 +- .../effecthandlers/AbstractStatEffect.java | 4 +- .../handlers/effecthandlers/AddHate.java | 2 +- .../effecthandlers/AddHuntingTime.java | 2 +- .../AddTeleportBookmarkSlot.java | 2 +- .../handlers/effecthandlers/AttackTrait.java | 2 +- .../handlers/effecthandlers/Backstab.java | 2 +- .../handlers/effecthandlers/Betray.java | 2 +- .../handlers/effecthandlers/Blink.java | 2 +- .../handlers/effecthandlers/BlinkSwap.java | 2 +- .../effecthandlers/BlockAbnormalSlot.java | 2 +- .../handlers/effecthandlers/BlockAction.java | 2 +- .../handlers/effecthandlers/BlockActions.java | 2 +- .../handlers/effecthandlers/BlockChat.java | 2 +- .../handlers/effecthandlers/BlockMove.java | 2 +- .../handlers/effecthandlers/BlockParty.java | 2 +- .../handlers/effecthandlers/BlockSkill.java | 2 +- .../handlers/effecthandlers/BlockTarget.java | 2 +- .../handlers/effecthandlers/Bluff.java | 2 +- .../effecthandlers/CallLearnedSkill.java | 2 +- .../handlers/effecthandlers/CallParty.java | 2 +- .../handlers/effecthandlers/CallPc.java | 2 +- .../effecthandlers/CallRandomSkill.java | 2 +- .../handlers/effecthandlers/CallSkill.java | 2 +- .../effecthandlers/CallSkillOnActionTime.java | 2 +- .../effecthandlers/CallTargetParty.java | 2 +- .../effecthandlers/ChameleonRest.java | 2 +- .../handlers/effecthandlers/ChangeBody.java | 2 +- .../handlers/effecthandlers/ChangeFace.java | 2 +- .../effecthandlers/ChangeHairColor.java | 2 +- .../effecthandlers/ChangeHairStyle.java | 2 +- .../handlers/effecthandlers/ClassChange.java | 2 +- .../handlers/effecthandlers/Compelling.java | 2 +- .../handlers/effecthandlers/Confuse.java | 2 +- .../handlers/effecthandlers/ConsumeBody.java | 2 +- .../handlers/effecthandlers/ConvertItem.java | 6 +- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/CpHeal.java | 2 +- .../effecthandlers/CpHealOverTime.java | 2 +- .../effecthandlers/CpHealPercent.java | 2 +- .../CriticalDamagePosition.java | 2 +- .../CriticalRatePositionBonus.java | 2 +- .../handlers/effecthandlers/DamOverTime.java | 2 +- .../effecthandlers/DamOverTimePercent.java | 2 +- .../handlers/effecthandlers/DeathLink.java | 2 +- .../handlers/effecthandlers/DefenceTrait.java | 2 +- .../handlers/effecthandlers/DeleteHate.java | 2 +- .../effecthandlers/DeleteHateOfMe.java | 2 +- .../effecthandlers/DeleteTopAgro.java | 2 +- .../effecthandlers/DetectHiddenObjects.java | 2 +- .../handlers/effecthandlers/Detection.java | 2 +- .../effecthandlers/DisableTargeting.java | 2 +- .../handlers/effecthandlers/Disarm.java | 2 +- .../handlers/effecthandlers/Disarmor.java | 4 +- .../handlers/effecthandlers/DispelAll.java | 2 +- .../effecthandlers/DispelByCategory.java | 2 +- .../handlers/effecthandlers/DispelBySlot.java | 2 +- .../effecthandlers/DispelBySlotMyself.java | 2 +- .../DispelBySlotProbability.java | 2 +- .../handlers/effecthandlers/DoubleCast.java | 2 +- .../handlers/effecthandlers/EnableCloak.java | 2 +- .../handlers/effecthandlers/EnergyAttack.java | 2 +- .../effecthandlers/EnlargeAbnormalSlot.java | 2 +- .../handlers/effecthandlers/Escape.java | 2 +- .../handlers/effecthandlers/FakeDeath.java | 2 +- .../handlers/effecthandlers/FatalBlow.java | 2 +- .../scripts/handlers/effecthandlers/Fear.java | 2 +- .../scripts/handlers/effecthandlers/Feed.java | 2 +- .../scripts/handlers/effecthandlers/Flag.java | 2 +- .../handlers/effecthandlers/FlipBlock.java | 2 +- .../handlers/effecthandlers/FlyAway.java | 2 +- .../effecthandlers/FocusMaxMomentum.java | 2 +- .../effecthandlers/FocusMomentum.java | 2 +- .../handlers/effecthandlers/FocusSouls.java | 2 +- .../handlers/effecthandlers/GetAgro.java | 2 +- .../handlers/effecthandlers/GetMomentum.java | 2 +- .../effecthandlers/GiveClanReputation.java | 2 +- .../handlers/effecthandlers/GiveExpAndSp.java | 2 +- .../handlers/effecthandlers/GiveFame.java | 2 +- .../effecthandlers/GiveHonorCoins.java | 2 +- .../effecthandlers/GiveRecommendation.java | 2 +- .../handlers/effecthandlers/GiveSp.java | 2 +- .../handlers/effecthandlers/GiveXp.java | 2 +- .../scripts/handlers/effecthandlers/Grow.java | 2 +- .../effecthandlers/HairAccessorySet.java | 2 +- .../handlers/effecthandlers/Harvesting.java | 2 +- .../effecthandlers/HeadquarterCreate.java | 2 +- .../scripts/handlers/effecthandlers/Heal.java | 4 +- .../handlers/effecthandlers/HealOverTime.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hide.java | 2 +- .../handlers/effecthandlers/HitAtNight.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../handlers/effecthandlers/HpByLevel.java | 2 +- .../handlers/effecthandlers/HpCpHeal.java | 4 +- .../handlers/effecthandlers/HpDrain.java | 2 +- .../handlers/effecthandlers/HpToOwner.java | 2 +- .../effecthandlers/ImmobilePetBuff.java | 2 +- .../handlers/effecthandlers/KarmaCount.java | 2 +- .../handlers/effecthandlers/KnockBack.java | 2 +- .../handlers/effecthandlers/Lethal.java | 2 +- .../handlers/effecthandlers/MagicMpCost.java | 2 +- .../MagicalAbnormalDispelAttack.java | 2 +- .../effecthandlers/MagicalAttack.java | 2 +- .../MagicalAttackByAbnormal.java | 2 +- .../MagicalAttackByAbnormalSlot.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 2 +- .../effecthandlers/MagicalAttackRange.java | 2 +- .../effecthandlers/MagicalDamOverTime.java | 2 +- .../effecthandlers/MagicalSoulAttack.java | 2 +- .../effecthandlers/ManaDamOverTime.java | 2 +- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealOverTime.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../handlers/effecthandlers/MaxCp.java | 2 +- .../handlers/effecthandlers/MaxHp.java | 2 +- .../handlers/effecthandlers/MaxMp.java | 2 +- .../effecthandlers/ModifyCraftPoints.java | 2 +- .../effecthandlers/ModifyDeathPoints.java | 2 +- .../effecthandlers/ModifyMagicLampPoints.java | 2 +- .../handlers/effecthandlers/ModifyVital.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/MpConsumePerLevel.java | 2 +- .../scripts/handlers/effecthandlers/Mute.java | 2 +- .../handlers/effecthandlers/OpenChest.java | 2 +- .../effecthandlers/OpenCommonRecipeBook.java | 2 +- .../handlers/effecthandlers/OpenDoor.java | 2 +- .../effecthandlers/OpenDwarfRecipeBook.java | 2 +- .../effecthandlers/PhysicalAttack.java | 2 +- .../effecthandlers/PhysicalAttackHpLink.java | 2 +- .../effecthandlers/PhysicalAttackMute.java | 2 +- .../effecthandlers/PhysicalAttackSaveHp.java | 2 +- .../PhysicalAttackWeaponBonus.java | 4 +- .../handlers/effecthandlers/PhysicalMute.java | 2 +- .../effecthandlers/PhysicalSoulAttack.java | 2 +- .../handlers/effecthandlers/PkCount.java | 2 +- .../handlers/effecthandlers/Plunder.java | 2 +- .../effecthandlers/PolearmSingleTarget.java | 2 +- .../handlers/effecthandlers/PullBack.java | 2 +- .../effecthandlers/RandomizeHate.java | 2 +- .../handlers/effecthandlers/RealDamage.java | 2 +- .../handlers/effecthandlers/RebalanceHP.java | 2 +- .../effecthandlers/RebalanceHPSummon.java | 2 +- .../RecoverVitalityInPeaceZone.java | 2 +- .../handlers/effecthandlers/ReduceDamage.java | 2 +- .../effecthandlers/RefuelAirship.java | 2 +- .../handlers/effecthandlers/Relax.java | 2 +- .../effecthandlers/ResetInstanceEntry.java | 2 +- .../handlers/effecthandlers/ResistSkill.java | 2 +- .../handlers/effecthandlers/Restoration.java | 2 +- .../effecthandlers/RestorationRandom.java | 2 +- .../handlers/effecthandlers/Resurrection.java | 2 +- .../handlers/effecthandlers/Reuse.java | 2 +- .../effecthandlers/ReuseSkillById.java | 2 +- .../scripts/handlers/effecthandlers/Root.java | 2 +- .../effecthandlers/SacrificeSummon.java | 2 +- .../effecthandlers/SayhaGraceSupport.java | 2 +- .../SendSystemMessageToClan.java | 2 +- .../handlers/effecthandlers/SetCp.java | 2 +- .../handlers/effecthandlers/SetHp.java | 2 +- .../handlers/effecthandlers/SetSkill.java | 2 +- .../handlers/effecthandlers/SkillEvasion.java | 2 +- .../handlers/effecthandlers/SkillTurning.java | 2 +- .../effecthandlers/SkillTurningOverTime.java | 2 +- .../handlers/effecthandlers/SoulBlow.java | 2 +- .../handlers/effecthandlers/SoulEating.java | 2 +- .../scripts/handlers/effecthandlers/Sow.java | 2 +- .../handlers/effecthandlers/Speed.java | 2 +- .../effecthandlers/SphericBarrier.java | 2 +- .../handlers/effecthandlers/Spoil.java | 2 +- .../StatBonusSkillCritical.java | 2 +- .../effecthandlers/StatBonusSpeed.java | 2 +- .../effecthandlers/StatByMoveType.java | 2 +- .../effecthandlers/StealAbnormal.java | 2 +- .../handlers/effecthandlers/Summon.java | 2 +- .../effecthandlers/SummonAgathion.java | 2 +- .../handlers/effecthandlers/SummonCubic.java | 2 +- .../effecthandlers/SummonHallucination.java | 2 +- .../handlers/effecthandlers/SummonMulti.java | 2 +- .../handlers/effecthandlers/SummonNpc.java | 2 +- .../handlers/effecthandlers/SummonPet.java | 2 +- .../handlers/effecthandlers/SummonTrap.java | 2 +- .../handlers/effecthandlers/Sweeper.java | 2 +- .../handlers/effecthandlers/Synergy.java | 2 +- .../handlers/effecthandlers/TakeCastle.java | 2 +- .../effecthandlers/TakeCastleStart.java | 2 +- .../handlers/effecthandlers/TakeFort.java | 2 +- .../effecthandlers/TakeFortStart.java | 2 +- .../handlers/effecthandlers/TalismanSlot.java | 2 +- .../handlers/effecthandlers/TargetCancel.java | 2 +- .../handlers/effecthandlers/TargetMe.java | 2 +- .../effecthandlers/TargetMeProbability.java | 2 +- .../handlers/effecthandlers/Teleport.java | 2 +- .../effecthandlers/TeleportToNpc.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../effecthandlers/TeleportToSummon.java | 2 +- .../effecthandlers/TeleportToTarget.java | 2 +- .../TransferDamageToPlayer.java | 2 +- .../handlers/effecthandlers/TransferHate.java | 2 +- .../effecthandlers/Transformation.java | 2 +- .../handlers/effecthandlers/TrapDetect.java | 2 +- .../handlers/effecthandlers/TrapRemove.java | 2 +- .../handlers/effecthandlers/TriggerSkill.java | 2 +- .../effecthandlers/TriggerSkillByAttack.java | 4 +- .../effecthandlers/TriggerSkillByAvoid.java | 2 +- .../effecthandlers/TriggerSkillByDamage.java | 2 +- .../TriggerSkillByDeathBlow.java | 2 +- .../TriggerSkillByDualRange.java | 2 +- .../TriggerSkillByHpPercent.java | 2 +- .../effecthandlers/TriggerSkillByKill.java | 2 +- .../TriggerSkillByMagicType.java | 2 +- .../effecthandlers/TriggerSkillBySkill.java | 2 +- .../TriggerSkillBySkillAttack.java | 2 +- .../effecthandlers/TwoHandedBluntBonus.java | 4 +- .../effecthandlers/TwoHandedSwordBonus.java | 4 +- .../handlers/effecthandlers/Unsummon.java | 2 +- .../effecthandlers/UnsummonAgathion.java | 2 +- .../effecthandlers/UnsummonServitors.java | 2 +- .../handlers/effecthandlers/Untargetable.java | 2 +- .../handlers/effecthandlers/VipUp.java | 2 +- .../effecthandlers/VitalityPointUp.java | 2 +- .../handlers/itemhandlers/AddSpiritExp.java | 2 +- .../handlers/itemhandlers/Appearance.java | 4 +- .../handlers/itemhandlers/BeastSoulShot.java | 2 +- .../itemhandlers/BeastSpiritShot.java | 2 +- .../itemhandlers/BlessedSoulShots.java | 4 +- .../itemhandlers/BlessedSpiritShot.java | 4 +- .../itemhandlers/BlessingScrolls.java | 2 +- .../scripts/handlers/itemhandlers/Book.java | 2 +- .../scripts/handlers/itemhandlers/Bypass.java | 2 +- .../handlers/itemhandlers/Calculator.java | 2 +- .../itemhandlers/ChangeAttributeCrystal.java | 2 +- .../handlers/itemhandlers/CharmOfCourage.java | 2 +- .../scripts/handlers/itemhandlers/Elixir.java | 2 +- .../itemhandlers/EnchantAttribute.java | 2 +- .../handlers/itemhandlers/EnchantScrolls.java | 2 +- .../handlers/itemhandlers/EventItem.java | 2 +- .../itemhandlers/ExtractableItems.java | 4 +- .../itemhandlers/FatedSupportBox.java | 2 +- .../handlers/itemhandlers/FishShots.java | 8 +- .../handlers/itemhandlers/Harvester.java | 2 +- .../handlers/itemhandlers/ItemSkills.java | 2 +- .../itemhandlers/ItemSkillsTemplate.java | 2 +- .../handlers/itemhandlers/LimitedSayha.java | 2 +- .../scripts/handlers/itemhandlers/Maps.java | 2 +- .../handlers/itemhandlers/MercTicket.java | 2 +- .../handlers/itemhandlers/NicknameColor.java | 2 +- .../handlers/itemhandlers/PetFood.java | 2 +- .../handlers/itemhandlers/Recipes.java | 2 +- .../handlers/itemhandlers/RollingDice.java | 2 +- .../scripts/handlers/itemhandlers/Seed.java | 2 +- .../handlers/itemhandlers/SoulShots.java | 4 +- .../handlers/itemhandlers/SpecialXMas.java | 2 +- .../handlers/itemhandlers/SpiritShot.java | 4 +- .../handlers/itemhandlers/SummonItems.java | 2 +- .../EquipArmorSkillCondition.java | 6 +- .../EquipShieldSkillCondition.java | 4 +- .../EquipSigilSkillCondition.java | 4 +- .../EquipWeaponSkillCondition.java | 4 +- .../Op2hWeaponSkillCondition.java | 6 +- .../OpChangeWeaponSkillCondition.java | 2 +- .../OpEquipItemSkillCondition.java | 2 +- .../OpTargetArmorTypeSkillCondition.java | 8 +- ...pTargetWeaponAttackTypeSkillCondition.java | 4 +- .../telnethandlers/player/Enchant.java | 2 +- .../handlers/telnethandlers/player/Give.java | 2 +- .../handlers/telnethandlers/server/Debug.java | 2 +- .../Q10971_TalismanEnchant.java | 2 +- .../Q10973_EnchantingAgathions.java | 2 +- .../Q10974_NewStylishEquipment.java | 2 +- .../l2jmobius/gameserver/ai/AbstractAI.java | 2 +- .../l2jmobius/gameserver/ai/AttackableAI.java | 2 +- .../l2jmobius/gameserver/ai/CreatureAI.java | 2 +- .../org/l2jmobius/gameserver/ai/DoorAI.java | 2 +- .../gameserver/ai/DoppelgangerAI.java | 2 +- .../l2jmobius/gameserver/ai/PlayableAI.java | 2 +- .../org/l2jmobius/gameserver/ai/SummonAI.java | 2 +- .../l2jmobius/gameserver/ai/VehicleAI.java | 2 +- .../gameserver/cache/PaperdollCache.java | 2 +- .../l2jmobius/gameserver/data/ItemTable.java | 12 +- .../gameserver/data/sql/CharSummonTable.java | 2 +- .../data/xml/AppearanceItemData.java | 6 +- .../gameserver/data/xml/ArmorSetData.java | 2 +- .../gameserver/data/xml/BuyListData.java | 2 +- .../gameserver/data/xml/CollectionData.java | 2 +- .../data/xml/CombinationItemsData.java | 6 +- .../data/xml/ElementalAttributeData.java | 2 +- .../gameserver/data/xml/EnchantItemData.java | 6 +- .../data/xml/EnchantItemGroupsData.java | 8 +- .../data/xml/EnchantItemHPBonusData.java | 6 +- .../data/xml/EnchantItemOptionsData.java | 2 +- .../gameserver/data/xml/EnsoulData.java | 2 +- .../gameserver/data/xml/HennaData.java | 2 +- .../data/xml/InitialEquipmentData.java | 2 +- .../data/xml/InitialShortcutData.java | 2 +- .../data/xml/ItemCrystallizationData.java | 10 +- .../data/xml/LimitShopCraftData.java | 2 +- .../gameserver/data/xml/LimitShopData.java | 2 +- .../gameserver/data/xml/MultisellData.java | 4 +- .../gameserver/data/xml/PrimeShopData.java | 2 +- .../gameserver/data/xml/RandomCraftData.java | 2 +- .../gameserver/data/xml/SkillTreeData.java | 2 +- .../gameserver/data/xml/VariationData.java | 2 +- .../gameserver/enums/CrystallizationType.java | 6 +- .../l2jmobius/gameserver/enums/ItemGrade.java | 2 +- .../gameserver/handler/IItemHandler.java | 2 +- .../gameserver/handler/ItemHandler.java | 2 +- .../instancemanager/CastleManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 2 +- .../ItemCommissionManager.java | 4 +- .../instancemanager/ItemsOnGroundManager.java | 2 +- .../instancemanager/RecipeManager.java | 4 +- .../instancemanager/SellBuffsManager.java | 2 +- .../instancemanager/SiegeGuardManager.java | 2 +- .../instancemanager/ZoneManager.java | 2 +- .../instancemanager/games/BlockChecker.java | 2 +- .../l2jmobius/gameserver/model/ArmorSet.java | 2 +- .../gameserver/model/CombatFlag.java | 2 +- .../gameserver/model/CursedWeapon.java | 4 +- .../l2jmobius/gameserver/model/ItemInfo.java | 6 +- .../l2jmobius/gameserver/model/Message.java | 2 +- .../org/l2jmobius/gameserver/model/Party.java | 2 +- .../org/l2jmobius/gameserver/model/Seed.java | 2 +- .../l2jmobius/gameserver/model/ShortCuts.java | 4 +- .../l2jmobius/gameserver/model/TempItem.java | 2 +- .../l2jmobius/gameserver/model/TimeStamp.java | 2 +- .../l2jmobius/gameserver/model/TradeItem.java | 4 +- .../l2jmobius/gameserver/model/TradeList.java | 4 +- .../gameserver/model/actor/Attackable.java | 4 +- .../gameserver/model/actor/Creature.java | 10 +- .../l2jmobius/gameserver/model/actor/Npc.java | 4 +- .../gameserver/model/actor/Playable.java | 2 +- .../gameserver/model/actor/Player.java | 18 +- .../gameserver/model/actor/Summon.java | 8 +- .../gameserver/model/actor/Vehicle.java | 4 +- .../model/actor/instance/Block.java | 2 +- .../model/actor/instance/Decoy.java | 4 +- .../gameserver/model/actor/instance/Door.java | 4 +- .../model/actor/instance/Monster.java | 2 +- .../gameserver/model/actor/instance/Pet.java | 6 +- .../model/actor/instance/RaceManager.java | 2 +- .../model/actor/instance/StaticObject.java | 4 +- .../model/actor/instance/TamedBeast.java | 2 +- .../gameserver/model/actor/instance/Trap.java | 4 +- .../model/actor/request/CompoundRequest.java | 2 +- .../request/EnchantItemAttributeRequest.java | 2 +- .../actor/request/EnchantItemRequest.java | 2 +- .../request/ShapeShiftingItemRequest.java | 2 +- .../model/actor/stat/CreatureStat.java | 2 +- .../model/actor/stat/PlayableStat.java | 2 +- .../model/actor/stat/PlayerStat.java | 4 +- .../model/actor/tasks/player/PetFeedTask.java | 2 +- .../actor/templates/CreatureTemplate.java | 2 +- .../model/actor/templates/NpcTemplate.java | 2 +- .../model/actor/transform/Transform.java | 2 +- .../actor/transform/TransformTemplate.java | 2 +- .../gameserver/model/buylist/Product.java | 4 +- .../model/commission/CommissionItem.java | 2 +- .../model/conditions/Condition.java | 2 +- .../conditions/ConditionCategoryType.java | 2 +- .../conditions/ConditionChangeWeapon.java | 4 +- .../model/conditions/ConditionGameChance.java | 2 +- .../model/conditions/ConditionGameTime.java | 2 +- .../model/conditions/ConditionInventory.java | 2 +- .../model/conditions/ConditionItemId.java | 2 +- .../model/conditions/ConditionLogicAnd.java | 2 +- .../model/conditions/ConditionLogicNot.java | 2 +- .../model/conditions/ConditionLogicOr.java | 2 +- .../conditions/ConditionMinDistance.java | 2 +- .../ConditionMinimumVitalityPoints.java | 2 +- .../ConditionPlayerActiveEffectId.java | 2 +- .../ConditionPlayerActiveSkillId.java | 2 +- .../conditions/ConditionPlayerAgathionId.java | 2 +- .../conditions/ConditionPlayerBaseStats.java | 2 +- .../conditions/ConditionPlayerCallPc.java | 2 +- .../ConditionPlayerCanCreateBase.java | 2 +- .../ConditionPlayerCanCreateOutpost.java | 2 +- .../conditions/ConditionPlayerCanEscape.java | 2 +- .../ConditionPlayerCanRefuelAirship.java | 2 +- .../ConditionPlayerCanResurrect.java | 2 +- .../ConditionPlayerCanSummonPet.java | 2 +- .../ConditionPlayerCanSummonServitor.java | 2 +- .../ConditionPlayerCanSummonSiegeGolem.java | 2 +- .../conditions/ConditionPlayerCanSweep.java | 2 +- .../ConditionPlayerCanSwitchSubclass.java | 2 +- .../ConditionPlayerCanTakeCastle.java | 2 +- .../ConditionPlayerCanTakeFort.java | 2 +- .../ConditionPlayerCanTransform.java | 2 +- .../ConditionPlayerCanUntransform.java | 2 +- .../conditions/ConditionPlayerCharges.java | 2 +- .../ConditionPlayerCheckAbnormal.java | 2 +- .../ConditionPlayerClassIdRestriction.java | 2 +- .../ConditionPlayerCloakStatus.java | 2 +- .../model/conditions/ConditionPlayerCp.java | 2 +- .../conditions/ConditionPlayerDualclass.java | 2 +- .../conditions/ConditionPlayerFlyMounted.java | 2 +- .../conditions/ConditionPlayerHasCastle.java | 2 +- .../ConditionPlayerHasClanHall.java | 2 +- .../conditions/ConditionPlayerHasFort.java | 2 +- .../ConditionPlayerHasFreeSummonPoints.java | 2 +- ...ionPlayerHasFreeTeleportBookmarkSlots.java | 2 +- .../conditions/ConditionPlayerHasPet.java | 4 +- .../conditions/ConditionPlayerHasSummon.java | 2 +- .../model/conditions/ConditionPlayerHp.java | 2 +- .../conditions/ConditionPlayerImmobile.java | 2 +- .../conditions/ConditionPlayerInInstance.java | 2 +- .../ConditionPlayerInsideZoneId.java | 2 +- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../conditions/ConditionPlayerInvSize.java | 2 +- .../ConditionPlayerIsClanLeader.java | 2 +- .../conditions/ConditionPlayerIsHero.java | 2 +- .../conditions/ConditionPlayerIsInCombat.java | 2 +- .../conditions/ConditionPlayerIsOnSide.java | 2 +- .../ConditionPlayerIsPvpFlagged.java | 2 +- .../ConditionPlayerLandingZone.java | 2 +- .../conditions/ConditionPlayerLevel.java | 2 +- .../conditions/ConditionPlayerLevelRange.java | 2 +- .../model/conditions/ConditionPlayerMp.java | 2 +- .../conditions/ConditionPlayerPkCount.java | 2 +- .../ConditionPlayerPledgeClass.java | 2 +- .../model/conditions/ConditionPlayerRace.java | 2 +- .../ConditionPlayerRangeFromNpc.java | 2 +- .../ConditionPlayerRangeFromSummonedNpc.java | 2 +- .../ConditionPlayerServitorNpcId.java | 2 +- .../model/conditions/ConditionPlayerSex.java | 2 +- .../conditions/ConditionPlayerSiegeSide.java | 2 +- .../conditions/ConditionPlayerSouls.java | 2 +- .../conditions/ConditionPlayerState.java | 2 +- .../conditions/ConditionPlayerSubclass.java | 2 +- .../ConditionPlayerTransformationId.java | 2 +- .../ConditionPlayerVehicleMounted.java | 2 +- .../conditions/ConditionPlayerWeight.java | 2 +- .../model/conditions/ConditionSiegeZone.java | 2 +- .../model/conditions/ConditionSlotItemId.java | 4 +- .../conditions/ConditionSlotItemType.java | 4 +- .../ConditionTargetAbnormalType.java | 2 +- .../ConditionTargetActiveEffectId.java | 2 +- .../ConditionTargetActiveSkillId.java | 2 +- .../conditions/ConditionTargetAggro.java | 2 +- .../ConditionTargetCheckCrtEffect.java | 2 +- .../ConditionTargetClassIdRestriction.java | 2 +- .../conditions/ConditionTargetInvSize.java | 2 +- .../conditions/ConditionTargetLevel.java | 2 +- .../conditions/ConditionTargetLevelRange.java | 2 +- .../ConditionTargetMyPartyExceptMe.java | 2 +- .../model/conditions/ConditionTargetNone.java | 2 +- .../conditions/ConditionTargetNpcId.java | 2 +- .../conditions/ConditionTargetNpcType.java | 2 +- .../conditions/ConditionTargetPlayable.java | 2 +- .../conditions/ConditionTargetPlayer.java | 2 +- .../model/conditions/ConditionTargetRace.java | 2 +- .../ConditionTargetUsesWeaponKind.java | 4 +- .../conditions/ConditionTargetWeight.java | 2 +- .../conditions/ConditionUsingItemType.java | 6 +- .../model/conditions/ConditionUsingSkill.java | 2 +- .../conditions/ConditionUsingSlotType.java | 2 +- .../model/conditions/ConditionWithSkill.java | 2 +- .../model/effects/AbstractEffect.java | 2 +- .../gameserver/model/ensoul/EnsoulFee.java | 2 +- .../model/events/AbstractScript.java | 8 +- .../impl/creature/player/OnPlayerAugment.java | 2 +- .../player/OnPlayerClanWHItemAdd.java | 2 +- .../player/OnPlayerClanWHItemDestroy.java | 2 +- .../player/OnPlayerClanWHItemTransfer.java | 2 +- .../creature/player/OnPlayerHennaAdd.java | 2 +- .../creature/player/OnPlayerHennaRemove.java | 2 +- .../impl/creature/player/OnPlayerItemAdd.java | 2 +- .../creature/player/OnPlayerItemDestroy.java | 2 +- .../creature/player/OnPlayerItemDrop.java | 2 +- .../creature/player/OnPlayerItemEquip.java | 2 +- .../creature/player/OnPlayerItemPickup.java | 2 +- .../creature/player/OnPlayerItemTransfer.java | 2 +- .../creature/player/OnPlayerItemUnequip.java | 2 +- .../events/impl/item/OnItemBypassEvent.java | 2 +- .../model/events/impl/item/OnItemCreate.java | 2 +- .../model/events/impl/item/OnItemTalk.java | 2 +- .../gameserver/model/fishing/Fishing.java | 4 +- .../model/holders/AppearanceHolder.java | 10 +- .../model/holders/ArmorsetSkillHolder.java | 2 +- .../model/holders/MultisellEntryHolder.java | 2 +- .../model/holders/PetItemHolder.java | 2 +- .../holders/PreparedMultisellListHolder.java | 2 +- .../model/holders/SkillUseHolder.java | 2 +- .../gameserver/model/item/Armor.java | 92 ++ .../gameserver/model/item/EtcItem.java | 156 +++ .../gameserver/model/item/Henna.java | 171 +++ .../model/{items => item}/ItemTemplate.java | 14 +- .../model/item/PlayerItemTemplate.java | 45 + .../model/{items => item}/WarehouseItem.java | 8 +- .../gameserver/model/item/Weapon.java | 311 +++++ .../item/appearance/AppearanceHandType.java | 27 + .../item/appearance/AppearanceMagicType.java | 27 + .../item/appearance/AppearanceStone.java | 558 +++++++++ .../item/appearance/AppearanceTargetType.java | 29 + .../model/item/appearance/AppearanceType.java | 29 + .../combination/CombinationItem.java | 2 +- .../combination/CombinationItemReward.java | 38 + .../item/combination/CombinationItemType.java | 26 + .../enchant/AbstractEnchantItem.java | 12 +- .../model/item/enchant/EnchantItemGroup.java | 97 ++ .../model/item/enchant/EnchantRateItem.java | 91 ++ .../model/item/enchant/EnchantResultType.java | 27 + .../enchant/EnchantScroll.java | 10 +- .../item/enchant/EnchantScrollGroup.java | 82 ++ .../item/enchant/EnchantSupportItem.java | 57 + .../enchant/attribute/AttributeHolder.java | 60 + .../model/{items => item}/instance/Item.java | 18 +- .../model/item/type/ActionType.java | 53 + .../gameserver/model/item/type/ArmorType.java | 51 + .../model/item/type/CrystalType.java | 88 ++ .../{items => item}/type/EtcItemType.java | 2 +- .../gameserver/model/item/type/ItemType.java | 26 + .../model/item/type/MaterialType.java | 53 + .../{items => item}/type/WeaponType.java | 2 +- .../model/itemauction/AuctionItem.java | 2 +- .../model/itemauction/ItemAuction.java | 2 +- .../itemauction/ItemAuctionInstance.java | 2 +- .../model/itemcontainer/ClanWarehouse.java | 2 +- .../model/itemcontainer/Inventory.java | 14 +- .../model/itemcontainer/ItemContainer.java | 4 +- .../gameserver/model/itemcontainer/Mail.java | 2 +- .../model/itemcontainer/PetInventory.java | 4 +- .../model/itemcontainer/PlayerInventory.java | 8 +- .../itemcontainer/PlayerRandomCraft.java | 2 +- .../model/itemcontainer/PlayerRefund.java | 2 +- .../gameserver/model/items/Armor.java | 92 -- .../gameserver/model/items/EtcItem.java | 156 --- .../gameserver/model/items/Henna.java | 171 --- .../model/items/PlayerItemTemplate.java | 45 - .../gameserver/model/items/Weapon.java | 311 ----- .../items/appearance/AppearanceHandType.java | 27 - .../items/appearance/AppearanceMagicType.java | 27 - .../items/appearance/AppearanceStone.java | 558 --------- .../appearance/AppearanceTargetType.java | 29 - .../items/appearance/AppearanceType.java | 29 - .../combination/CombinationItemReward.java | 38 - .../combination/CombinationItemType.java | 26 - .../model/items/enchant/EnchantItemGroup.java | 97 -- .../model/items/enchant/EnchantRateItem.java | 91 -- .../items/enchant/EnchantResultType.java | 27 - .../items/enchant/EnchantScrollGroup.java | 82 -- .../items/enchant/EnchantSupportItem.java | 57 - .../enchant/attribute/AttributeHolder.java | 60 - .../model/items/type/ActionType.java | 53 - .../model/items/type/ArmorType.java | 51 - .../model/items/type/CrystalType.java | 88 -- .../gameserver/model/items/type/ItemType.java | 26 - .../model/items/type/MaterialType.java | 53 - .../model/olympiad/AbstractOlympiadGame.java | 2 +- .../gameserver/model/olympiad/Hero.java | 2 +- .../gameserver/model/quest/Quest.java | 4 +- .../model/residences/ResidenceFunction.java | 2 +- .../gameserver/model/skills/BuffInfo.java | 2 +- .../gameserver/model/skills/Skill.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 8 +- .../gameserver/model/stats/Formulas.java | 10 +- .../gameserver/model/stats/IStatFunction.java | 8 +- .../stats/finalizers/AttributeFinalizer.java | 4 +- .../stats/finalizers/MAccuracyFinalizer.java | 2 +- .../stats/finalizers/MAttackFinalizer.java | 2 +- .../stats/finalizers/MCritRateFinalizer.java | 2 +- .../stats/finalizers/MDefenseFinalizer.java | 2 +- .../finalizers/MEvasionRateFinalizer.java | 2 +- .../stats/finalizers/MaxHpFinalizer.java | 4 +- .../stats/finalizers/MaxMpFinalizer.java | 2 +- .../stats/finalizers/PAccuracyFinalizer.java | 2 +- .../stats/finalizers/PAttackFinalizer.java | 2 +- .../finalizers/PCriticalRateFinalizer.java | 2 +- .../stats/finalizers/PDefenseFinalizer.java | 4 +- .../finalizers/PEvasionRateFinalizer.java | 2 +- .../stats/finalizers/ShotsBonusFinalizer.java | 2 +- .../stats/finalizers/SpeedFinalizer.java | 2 +- .../model/teleporter/TeleportHolder.java | 2 +- .../gameserver/model/zone/ZoneForm.java | 2 +- .../clientpackets/AbstractRefinePacket.java | 6 +- .../network/clientpackets/AddTradeItem.java | 2 +- .../clientpackets/CharacterCreate.java | 4 +- .../network/clientpackets/EnterWorld.java | 6 +- .../MoveToLocationInAirShip.java | 2 +- .../clientpackets/MultiSellChoose.java | 6 +- .../clientpackets/RequestAutoSoulShot.java | 6 +- .../network/clientpackets/RequestBuySeed.java | 2 +- .../clientpackets/RequestBypassToServer.java | 2 +- .../RequestCancelPostAttachment.java | 2 +- .../RequestChangeNicknameColor.java | 2 +- .../RequestConfirmCancelItem.java | 2 +- .../clientpackets/RequestConfirmGemStone.java | 2 +- .../RequestConfirmRefinerItem.java | 2 +- .../RequestConfirmTargetItem.java | 2 +- .../clientpackets/RequestCrystallizeItem.java | 4 +- .../clientpackets/RequestDestroyItem.java | 2 +- .../clientpackets/RequestDropItem.java | 8 +- .../clientpackets/RequestEnchantItem.java | 10 +- .../RequestExAddEnchantScrollItem.java | 4 +- .../RequestExEnchantItemAttribute.java | 4 +- .../RequestExRemoveEnchantSupportItem.java | 2 +- .../RequestExRemoveItemAttribute.java | 4 +- .../clientpackets/RequestExRqItemLink.java | 2 +- .../RequestExTryToPutEnchantSupportItem.java | 6 +- .../RequestExTryToPutEnchantTargetItem.java | 4 +- .../clientpackets/RequestHennaEquip.java | 2 +- .../clientpackets/RequestHennaItemInfo.java | 2 +- .../RequestHennaItemRemoveInfo.java | 2 +- .../clientpackets/RequestHennaRemove.java | 2 +- .../RequestMoveToLocationInVehicle.java | 2 +- .../clientpackets/RequestPackageSend.java | 2 +- .../clientpackets/RequestPostAttachment.java | 2 +- .../clientpackets/RequestPreviewItem.java | 10 +- .../clientpackets/RequestProcureCropList.java | 4 +- .../network/clientpackets/RequestRefine.java | 2 +- .../clientpackets/RequestRefineCancel.java | 2 +- .../clientpackets/RequestRefundItem.java | 4 +- .../RequestSaveInventoryOrder.java | 2 +- .../clientpackets/RequestSellItem.java | 2 +- .../clientpackets/RequestSendPost.java | 2 +- .../clientpackets/RequestUnEquipItem.java | 6 +- .../network/clientpackets/Say2.java | 2 +- .../SendWareHouseDepositList.java | 2 +- .../SendWareHouseWithDrawList.java | 2 +- .../clientpackets/SetPrivateStoreListBuy.java | 2 +- .../network/clientpackets/UseItem.java | 10 +- ...yToPutShapeShiftingEnchantSupportItem.java | 8 +- ...uestExTryToPutShapeShiftingTargetItem.java | 4 +- .../appearance/RequestShapeShiftingItem.java | 8 +- .../attendance/RequestVipAttendanceCheck.java | 2 +- .../RequestChangeAttributeItem.java | 4 +- .../SendChangeAttributeTargetItem.java | 2 +- .../ExRequestActivateAutoShortcut.java | 2 +- .../blessing/RequestBlessOptionEnchant.java | 4 +- .../blessing/RequestBlessOptionPutItem.java | 2 +- .../collection/RequestCollectionRegister.java | 2 +- .../commission/RequestCommissionInfo.java | 2 +- .../commission/RequestCommissionList.java | 4 +- .../compound/RequestNewEnchantPushOne.java | 4 +- .../compound/RequestNewEnchantPushTwo.java | 4 +- .../compound/RequestNewEnchantRemoveOne.java | 2 +- .../compound/RequestNewEnchantRemoveTwo.java | 2 +- .../RequestNewEnchantRetryToPutItems.java | 4 +- .../compound/RequestNewEnchantTry.java | 8 +- .../RequestCrystallizeEstimate.java | 4 +- .../ensoul/RequestItemEnsoul.java | 2 +- .../ensoul/RequestTryEnSoulExtraction.java | 2 +- .../RequestUpgradeSystemResult.java | 4 +- .../RequestPurchaseLimitShopItemBuy.java | 2 +- .../luckygame/RequestLuckyGamePlay.java | 2 +- .../clientpackets/pet/ExEvolvePet.java | 2 +- .../clientpackets/pet/ExPetEquipItem.java | 4 +- .../clientpackets/pet/ExPetUnequipItem.java | 4 +- .../pet/RequestGetItemFromPet.java | 2 +- .../pet/RequestGiveItemToPet.java | 2 +- .../clientpackets/pet/RequestPetGetItem.java | 2 +- .../clientpackets/pet/RequestPetUseItem.java | 2 +- .../ExRequestRandomCraftExtract.java | 2 +- .../ExRequestRandomCraftLockSlot.java | 2 +- .../shuttle/MoveToLocationInShuttle.java | 2 +- .../AbstractInventoryUpdate.java | 2 +- .../serverpackets/AbstractItemPacket.java | 4 +- .../network/serverpackets/DropItem.java | 2 +- .../network/serverpackets/EnchantResult.java | 2 +- .../network/serverpackets/ExBuySellList.java | 2 +- .../ExChooseInventoryAttributeItem.java | 2 +- .../network/serverpackets/ExDieInfo.java | 2 +- .../network/serverpackets/ExItemAnnounce.java | 2 +- .../ExPutItemResultForVariationCancel.java | 2 +- .../serverpackets/ExQuestItemList.java | 2 +- .../serverpackets/ExReplyPostItemList.java | 2 +- .../serverpackets/ExReplyReceivedPost.java | 2 +- .../serverpackets/ExReplySentPost.java | 2 +- .../network/serverpackets/ExRpItemLink.java | 2 +- .../ExShowBaseAttributeCancelWindow.java | 2 +- .../serverpackets/ExShowSellCropList.java | 2 +- .../network/serverpackets/GMHennaInfo.java | 2 +- .../network/serverpackets/GMViewItemList.java | 2 +- .../GMViewWarehouseWithdrawList.java | 2 +- .../network/serverpackets/GetItem.java | 2 +- .../network/serverpackets/HennaEquipList.java | 2 +- .../network/serverpackets/HennaInfo.java | 2 +- .../serverpackets/HennaItemDrawInfo.java | 2 +- .../serverpackets/HennaItemRemoveInfo.java | 2 +- .../serverpackets/HennaRemoveList.java | 2 +- .../serverpackets/InventoryUpdate.java | 2 +- .../network/serverpackets/ItemList.java | 2 +- .../network/serverpackets/MultiSellList.java | 4 +- .../serverpackets/PackageSendableList.java | 2 +- .../PrivateStoreManageListBuy.java | 2 +- .../serverpackets/SellListProcure.java | 2 +- .../serverpackets/ShopPreviewList.java | 2 +- .../network/serverpackets/SpawnItem.java | 2 +- .../network/serverpackets/SystemMessage.java | 4 +- .../network/serverpackets/TradeStart.java | 2 +- .../serverpackets/WareHouseDepositList.java | 2 +- .../WareHouseWithdrawalList.java | 2 +- .../appearance/ExChooseShapeShiftingItem.java | 6 +- .../ExChangeAttributeInfo.java | 2 +- .../collection/ExCollectionRegister.java | 2 +- .../ExResponseCommissionItemList.java | 2 +- .../ensoul/ExEnSoulExtractionResult.java | 2 +- .../serverpackets/ensoul/ExEnsoulResult.java | 2 +- .../serverpackets/pet/PetInventoryUpdate.java | 2 +- .../serverpackets/pet/PetItemList.java | 2 +- .../vip/ReceiveVipLuckyGameInfo.java | 2 +- .../taskmanager/AutoPlayTaskManager.java | 2 +- .../taskmanager/AutoPotionTaskManager.java | 2 +- .../taskmanager/AutoUseTaskManager.java | 6 +- .../ItemAppearanceTaskManager.java | 2 +- .../taskmanager/ItemLifeTimeTaskManager.java | 2 +- .../taskmanager/ItemManaTaskManager.java | 2 +- .../ItemsAutoDestroyTaskManager.java | 2 +- .../gameserver/util/DocumentBase.java | 6 +- .../gameserver/util/DocumentItem.java | 4 +- .../org/l2jmobius/gameserver/util/Evolve.java | 2 +- .../org/l2jmobius/log/filter/ItemFilter.java | 6 +- .../log/formatter/EnchantFormatter.java | 2 +- .../log/formatter/ItemLogFormatter.java | 2 +- 16288 files changed, 62785 insertions(+), 62785 deletions(-) rename L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/{items => item}/Armor.java (92%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/EtcItem.java (93%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/Henna.java (95%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/ItemTemplate.java (94%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/PlayerItemTemplate.java (93%) rename L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/{items => item}/WarehouseItem.java (90%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/Weapon.java (94%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/appearance/AppearanceHandType.java (90%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/appearance/AppearanceMagicType.java (90%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/appearance/AppearanceStone.java (93%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/appearance/AppearanceTargetType.java (90%) rename L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/{items => item}/appearance/AppearanceType.java (90%) rename L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/{items => item}/combination/CombinationItem.java (92%) rename L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/{items => item}/combination/CombinationItemReward.java (91%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/combination/CombinationItemType.java (90%) rename {L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/enchant/AbstractEnchantItem.java (90%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantItemGroup.java (94%) rename L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantRateItem.java (90%) rename L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantResultType.java (90%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantScroll.java (93%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantScrollGroup.java (90%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantSupportItem.java (89%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/enchant/attribute/AttributeHolder.java (91%) rename L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) rename L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/{items => item}/type/ActionType.java (91%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/type/ArmorType.java (91%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/type/CrystalType.java (93%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/type/EtcItemType.java (93%) rename L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/{items => item}/type/ItemType.java (91%) rename L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/{items => item}/type/MaterialType.java (91%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item}/type/WeaponType.java (94%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/Armor.java (92%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/EtcItem.java (93%) rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/Henna.java (95%) rename L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/{items => item}/ItemTemplate.java (94%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/PlayerItemTemplate.java (93%) rename {L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/WarehouseItem.java (91%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/Weapon.java (94%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/appearance/AppearanceHandType.java (90%) rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/appearance/AppearanceMagicType.java (90%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/appearance/AppearanceStone.java (93%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/appearance/AppearanceTargetType.java (90%) rename L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/{items => item}/appearance/AppearanceType.java (90%) rename L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/{items => item}/combination/CombinationItem.java (92%) rename L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/{items => item}/combination/CombinationItemReward.java (91%) rename L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/{items => item}/combination/CombinationItemType.java (90%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/enchant/AbstractEnchantItem.java (90%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantItemGroup.java (94%) rename L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantRateItem.java (90%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantResultType.java (90%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantScroll.java (93%) rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantScrollGroup.java (90%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantSupportItem.java (89%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/enchant/attribute/AttributeHolder.java (91%) rename L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) rename L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/{items => item}/type/ActionType.java (91%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/type/ArmorType.java (91%) rename L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/{items => item}/type/CrystalType.java (93%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/type/EtcItemType.java (93%) rename L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/{items => item}/type/ItemType.java (91%) rename L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/{items => item}/type/MaterialType.java (91%) rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item}/type/WeaponType.java (94%) rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/Armor.java (92%) rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/EtcItem.java (93%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/Henna.java (95%) rename {L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/ItemTemplate.java (94%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/PlayerItemTemplate.java (93%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/WarehouseItem.java (91%) rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/Weapon.java (94%) rename L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/{items => item}/appearance/AppearanceHandType.java (90%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/appearance/AppearanceMagicType.java (90%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/appearance/AppearanceStone.java (93%) rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/appearance/AppearanceTargetType.java (90%) rename L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/{items => item}/appearance/AppearanceType.java (90%) rename L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/{items => item}/combination/CombinationItem.java (92%) rename L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/{items => item}/combination/CombinationItemReward.java (91%) rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/combination/CombinationItemType.java (90%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/enchant/AbstractEnchantItem.java (90%) rename L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantItemGroup.java (94%) rename L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantRateItem.java (90%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantResultType.java (90%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantScroll.java (93%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantScrollGroup.java (90%) rename L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantSupportItem.java (89%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/enchant/attribute/AttributeHolder.java (91%) rename L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) rename L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/{items => item}/type/ActionType.java (91%) rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/type/ArmorType.java (91%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/type/CrystalType.java (93%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/type/EtcItemType.java (93%) rename L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/{items => item}/type/ItemType.java (91%) rename L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/{items => item}/type/MaterialType.java (91%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item}/type/WeaponType.java (94%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/Armor.java (92%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/EtcItem.java (93%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/Henna.java (95%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/ItemTemplate.java (94%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/PlayerItemTemplate.java (93%) rename {L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/WarehouseItem.java (91%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/Weapon.java (94%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/appearance/AppearanceHandType.java (90%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/appearance/AppearanceMagicType.java (90%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/appearance/AppearanceStone.java (93%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/appearance/AppearanceTargetType.java (90%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/appearance/AppearanceType.java (90%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/combination/CombinationItem.java (92%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/combination/CombinationItemReward.java (91%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/combination/CombinationItemType.java (90%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/enchant/AbstractEnchantItem.java (90%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantItemGroup.java (94%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantRateItem.java (90%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantResultType.java (90%) rename {L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantScroll.java (93%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantScrollGroup.java (90%) rename {L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantSupportItem.java (90%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/enchant/attribute/AttributeHolder.java (91%) rename {L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/instance/Item.java (95%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/type/ActionType.java (91%) rename {L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/type/ArmorType.java (91%) rename {L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/type/CrystalType.java (94%) rename {L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/type/EtcItemType.java (93%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/type/ItemType.java (91%) rename L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/{items => item}/type/MaterialType.java (91%) rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item}/type/WeaponType.java (94%) rename L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/{items => item}/Armor.java (92%) create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/EtcItem.java create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Henna.java rename L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/{items => item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java rename L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/{items => item}/WarehouseItem.java (91%) create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Weapon.java create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java rename L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/{items => item}/appearance/AppearanceStone.java (93%) create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java rename L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/{items => item}/enchant/AbstractEnchantItem.java (90%) create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java rename L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantRateItem.java (90%) create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantScroll.java (93%) create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java rename {L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantSupportItem.java (90%) create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java rename {L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item}/type/CrystalType.java (94%) rename {L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item}/type/EtcItemType.java (93%) create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Henna.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Weapon.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename {L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item}/Armor.java (92%) create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/EtcItem.java create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Henna.java rename L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/{items => item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java rename L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/{items => item}/WarehouseItem.java (91%) create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Weapon.java create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java rename L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/{items => item}/appearance/AppearanceStone.java (93%) create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java rename L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/{items => item}/enchant/AbstractEnchantItem.java (90%) create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java rename L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantRateItem.java (90%) create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java rename L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantScroll.java (93%) create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java rename {L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantSupportItem.java (90%) create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item}/type/CrystalType.java (94%) rename {L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item}/type/EtcItemType.java (93%) create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Henna.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Weapon.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename {L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item}/Armor.java (92%) create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/EtcItem.java create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Henna.java rename {L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java rename L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/{items => item}/WarehouseItem.java (91%) create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Weapon.java create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java rename L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/{items => item}/appearance/AppearanceStone.java (93%) create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java rename L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/{items => item}/enchant/AbstractEnchantItem.java (90%) create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java rename L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantRateItem.java (90%) create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java rename L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantScroll.java (93%) create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantSupportItem.java (90%) create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java rename {L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item}/type/CrystalType.java (94%) rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item}/type/EtcItemType.java (93%) create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Henna.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Weapon.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename {L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item}/Armor.java (92%) create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/EtcItem.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/Henna.java rename L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/{items => item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java rename L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/{items => item}/WarehouseItem.java (91%) rename L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/{items => item}/Weapon.java (94%) create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java rename L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/{items => item}/appearance/AppearanceStone.java (93%) create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java rename L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantRateItem.java (90%) create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java rename {L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item}/type/CrystalType.java (94%) create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Henna.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/{items => item}/Armor.java (92%) create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/EtcItem.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/Henna.java rename {L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java rename L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/{items => item}/Weapon.java (94%) create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java rename {L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item}/type/CrystalType.java (94%) create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Henna.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/{items => item}/Armor.java (92%) create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/EtcItem.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/Henna.java rename {L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java rename L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/{items => item}/Weapon.java (94%) create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java rename L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/{items => item}/combination/CombinationItem.java (93%) create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java rename {L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item}/type/CrystalType.java (94%) create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Henna.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/{items => item}/Armor.java (92%) create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/EtcItem.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/Henna.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java rename L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/{items => item}/Weapon.java (94%) create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java rename L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/{items => item}/combination/CombinationItem.java (93%) create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/Henna.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{items => item}/Armor.java (92%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{items => item}/EtcItem.java (91%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{items => item}/Henna.java (94%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{items => item}/ItemTemplate.java (94%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{items => item}/Weapon.java (95%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{items => item}/type/ArmorType.java (92%) rename {L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item}/type/EtcItemType.java (93%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{items => item}/type/ItemType.java (91%) rename L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/{items => item}/type/WeaponType.java (93%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{items => item}/Armor.java (92%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{items => item}/EtcItem.java (91%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{items => item}/Henna.java (94%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{items => item}/ItemTemplate.java (94%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{items => item}/Weapon.java (95%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{items => item}/type/ArmorType.java (92%) rename {L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item}/type/EtcItemType.java (93%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{items => item}/type/ItemType.java (91%) rename L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/{items => item}/type/WeaponType.java (93%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{items => item}/Armor.java (93%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{items => item}/EtcItem.java (93%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{items => item}/Henna.java (94%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{items => item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{items => item}/WarehouseItem.java (90%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{items => item}/Weapon.java (95%) rename {L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item}/enchant/AbstractEnchantItem.java (88%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantItemGroup.java (94%) create mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantScroll.java (92%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantScrollGroup.java (90%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantSupportItem.java (87%) rename {L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item}/instance/Item.java (95%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{items => item}/type/ActionType.java (91%) create mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java rename {L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item}/type/CrystalType.java (93%) rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{items => item}/type/EtcItemType.java (92%) create mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java rename L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/{items => item}/type/WeaponType.java (93%) delete mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{items => item}/Armor.java (93%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{items => item}/EtcItem.java (93%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{items => item}/Henna.java (94%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{items => item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{items => item}/WarehouseItem.java (90%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{items => item}/Weapon.java (95%) rename {L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item}/enchant/AbstractEnchantItem.java (88%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantItemGroup.java (94%) create mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantScroll.java (92%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantScrollGroup.java (90%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantSupportItem.java (87%) rename {L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item}/instance/Item.java (95%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{items => item}/type/ActionType.java (91%) create mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java rename {L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item}/type/CrystalType.java (93%) rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{items => item}/type/EtcItemType.java (92%) create mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java rename L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/{items => item}/type/WeaponType.java (93%) delete mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Armor.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/EtcItem.java rename L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/{items => item}/Henna.java (94%) rename {L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item}/WarehouseItem.java (91%) create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Weapon.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item}/enchant/AbstractEnchantItem.java (90%) create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java rename {L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantScroll.java (93%) create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java rename L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantSupportItem.java (89%) create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename {L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java rename L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/{items => item}/type/CrystalType.java (93%) rename L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/{items => item}/type/EtcItemType.java (93%) create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Armor.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Weapon.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/Armor.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/EtcItem.java rename L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/{items => item}/Henna.java (94%) rename {L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/Weapon.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java rename {L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item}/enchant/EnchantScroll.java (93%) create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename {L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Armor.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Weapon.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/{items => item}/Armor.java (92%) create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/EtcItem.java rename L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/{items => item}/Henna.java (94%) rename L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/{items => item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/Weapon.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java rename L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantScroll.java (93%) create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Weapon.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename {L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item}/Armor.java (92%) create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/EtcItem.java rename L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/{items => item}/Henna.java (94%) rename {L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/Weapon.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java rename L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantScroll.java (93%) create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Weapon.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Armor.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/EtcItem.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Henna.java rename {L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Weapon.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Armor.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Henna.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Weapon.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Armor.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/EtcItem.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Henna.java rename {L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Weapon.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Armor.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Henna.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Weapon.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Armor.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/EtcItem.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Henna.java rename {L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java rename L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/{items => item}/WarehouseItem.java (90%) create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/{items => item}/Armor.java (92%) create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/EtcItem.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Henna.java rename {L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java rename L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/{items => item}/WarehouseItem.java (91%) create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Weapon.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java rename L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/{items => item}/enchant/AbstractEnchantItem.java (90%) create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java rename L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantScroll.java (93%) create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java rename L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/{items => item}/type/EtcItemType.java (93%) create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Henna.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Weapon.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Armor.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/EtcItem.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Henna.java rename {L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items => L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java rename L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/{items => item}/WarehouseItem.java (91%) create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Weapon.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java rename L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/{items => item}/combination/CombinationItem.java (93%) create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java rename L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/{items => item}/enchant/AbstractEnchantItem.java (90%) create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java rename L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantScroll.java (93%) create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java rename L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/{items => item}/type/EtcItemType.java (93%) create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java rename L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/{items => item}/type/WeaponType.java (94%) delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Armor.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Henna.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Weapon.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/Armor.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/EtcItem.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/Henna.java rename L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/{items => item}/ItemTemplate.java (94%) create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java rename L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/{items => item}/WarehouseItem.java (91%) create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/Weapon.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java rename L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/{items => item}/combination/CombinationItem.java (93%) create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java rename L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/{items => item}/enchant/AbstractEnchantItem.java (90%) create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java rename L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/{items => item}/enchant/EnchantScroll.java (93%) create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java rename L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/{items => item}/instance/Item.java (95%) create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/ActionType.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java rename L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/{items => item}/type/EtcItemType.java (93%) create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/ItemType.java create mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java rename L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/{items => item}/type/WeaponType.java (94%) delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/Armor.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/EtcItem.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/Henna.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/Weapon.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/ActionType.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/ItemType.java delete mode 100644 L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 5088f1619d..872e71f3d9 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index cde471aff7..27a60e05f3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java index 299274160b..e1f6de3c80 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExGetPremiumItemList; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DragonWeaponListeners.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DragonWeaponListeners.java index 09171d6d97..c50af03d70 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DragonWeaponListeners.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/DragonWeaponListeners.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemEquip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java index 07d6a45613..ea67a6b16c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 3b1b619c8d..b9afcfac30 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 69349fc9ef..5f7c45d595 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionCancel; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 9a1bfbc322..4afd6e9f3c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 1ff3d6ae84..ee5c5e5649 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index a1dac8e67f..4a0debf3a8 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 0a82f9968d..35d31315ad 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 59e5b148a1..76d08b7a2b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index dd5c2f593d..2ea2bf9f11 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index f7054e99e9..17d76b1bf6 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d5d2ad10cf..8f4db5d580 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 0ae4fd3481..d7c59f6780 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index a403724d9a..10d1c9e03b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2b6db19588..607dc3b8f5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 7d0f0b43ba..9723633d69 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 4fdcb5ca9a..a4f5e2fc18 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index c6430fd345..8eaf69885f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index bfc65e27f5..879983272a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index d592bba597..96b98f6548 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index aa2eabd231..5690696b29 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 2ed9c1c346..7f5e0e87a1 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index a5cdbefa8b..f534a5ca55 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java index d480511447..c69477f113 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index ecebff8fcf..bbe94f05d2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d55c2897df..a58e246a0d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 742ca00283..3d97c9ac22 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 3eb4d77710..8b4d315b50 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 7e60c89db5..2ca2c2fc70 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 6a58fbf31b..f4ff6be84c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6f313482ab..54230f39a1 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b485046a39..25c237e53f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 410e71cff8..01714d7f5a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index c6528207ac..a0b53bbc44 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 90b5312e92..b860d16e2f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 2472a2d955..85d614b478 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index d1d5c8c332..c2610ec4e3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 1ce79dfd19..b52edb27a1 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 87124f7e62..0ad488d187 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 0d473e215d..34b5e9e506 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 49c4a5d92d..f95ae79097 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 02629d5d34..e17c4d3c90 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27f0904f0f..a61cc1bd71 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 255f805e72..12f575b243 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index ff9e654e61..3aeadd38a7 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 0ff861388c..75ab0bae7e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index 77818c7d68..9088e97943 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java index 2ad8e45099..3f580995d2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 252f6cdb3e..40fb48b033 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java index a9aa767e9b..f7dbd2b655 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java @@ -22,7 +22,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java index b9d21a55ae..40e84f4dd0 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java @@ -19,7 +19,7 @@ package quests.Q00756_TopQualityPetra; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java index 8afc6f6ff9..ceef25c804 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java index 90a68d79e3..075ada8600 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java @@ -18,7 +18,7 @@ package quests.Q10303_CrossroadsBetweenLightAndDarkness; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java index a1ce88bb4a..82d2e66d32 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java index cacdac5efe..5379818de9 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.annotations.Id; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerAugment; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java index faa49497bf..3dd42f74db 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/ItemTable.java index 9197c33197..914259543f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index e6a4acdcb5..63e8fac185 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 99e8b8b3d2..1c3099e6c4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index d134fe859e..c57e62c683 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 4793281033..18a8c90960 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index d2337f0f98..df1c988200 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 0f7be781b2..7bc7be8487 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index ba3ab89b07..20d23bc7fc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 2958e1cba9..f5e48bd424 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -35,9 +35,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 3d21c7ddf0..5f3eb28e8a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ArmorSet.java index 4d11cf0970..a84709e2db 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CombatFlag.java index dc49fce1cc..7385a9fc13 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CursedWeapon.java index f34fda05ad..806375ccc4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ItemInfo.java index e698197219..be9f4aed00 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -21,9 +21,9 @@ import java.util.Objects; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java index ec67ca4a4a..5244307c22 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java @@ -45,8 +45,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java index a9796fbbb7..36f3461010 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeItem.java index 611343da6b..ffaddf73a1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model; import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeList.java index ff44805912..299c136cf4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java index ba689f3014..953f591471 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -65,8 +65,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java index 7cf1def93c..025f027221 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java index 90ae8e40c5..7df1657bb1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java index 9ac4e5cfb6..a906614827 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -224,6 +224,16 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; @@ -231,16 +241,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java index 1d10d176ce..3d1b9ef6c2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index b93149d928..0423214997 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b3fac75f08..8f7214b2d0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index bff7d7d596..678412218a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; public class PlayableStat extends CreatureStat diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 68d45565c9..102540e266 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index da03c6b165..d93e4def4d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 6edc19b444..a62d59b876 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/Condition.java index cc50b04bf1..63a6b5ba3b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9c053efc5e..ebe8b7499f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 5b4ab6daf1..d68a40ee75 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 85c89d15ec..4c9bc6856c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 68990650dd..c08b648e55 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index bab8b12ab1..9f4fdbdfc9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index 952f083c90..3f89277658 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index e0943615ad..aecf7ec87d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -131,15 +131,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index 6366293771..9f5cd48551 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 16644245de..c792f858bb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index 574e07a8e7..a6b878697e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/Armor.java index 6a27c29819..6d53c84197 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/EtcItem.java similarity index 93% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/EtcItem.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/EtcItem.java index af7b9293fb..aada2ffd22 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; /** * This class is dedicated to the management of EtcItem. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/Henna.java similarity index 95% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/Henna.java index 426a12682a..0d1de91388 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.EnumMap; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index d92bf00f39..8aabc7b9aa 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java similarity index 93% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java index c632a41dfb..e9aa728f69 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 90% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index cd3447256e..f3f56d7985 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/Weapon.java similarity index 94% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/Weapon.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/Weapon.java index 85bb22d23b..3ae599da0d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java similarity index 90% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java index 54e66a6721..539c32ff6f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java similarity index 90% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java index 183600e31d..a1b472975a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java similarity index 93% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index aafdba599e..4736db96a7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; import java.time.Duration; import java.util.ArrayList; @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java similarity index 90% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java index 0b31f45cd8..a550363da5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java similarity index 90% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java index a6dfe151d7..a52e0900ca 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java similarity index 92% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java index a2897ba911..6f73983c0e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; import java.util.EnumMap; import java.util.Map; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java similarity index 91% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java index f36ed1b5c5..dcfa1d485d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; import org.l2jmobius.gameserver.model.holders.ItemHolder; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java similarity index 90% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java index e1a3a657ad..920fa01cc1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java similarity index 90% rename from L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index a09b01d571..8890655085 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java similarity index 94% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java index 7ba1d42d99..27d5d894bd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.ArrayList; import java.util.List; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java similarity index 90% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java index fb23338d90..6b234768e4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java similarity index 90% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java index 3e17edd870..f46dd28657 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 93% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index 79c0d9c517..28206a00fe 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.stats.Stat; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java similarity index 90% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java index 3a4fff76e5..e1e485672e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java similarity index 89% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java index 13d6b5a2ee..bfe1c295da 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java similarity index 91% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java index c8b8dff6ad..a2f5eaffa7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; +package org.l2jmobius.gameserver.model.item.enchant.attribute; import org.l2jmobius.gameserver.enums.AttributeType; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java index d94676209a..e15334878d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -67,14 +67,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent; import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/ActionType.java similarity index 91% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/ActionType.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/ActionType.java index 3693ba3816..7ae67f3249 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Action Type enumerated. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java similarity index 91% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java index b0dd4eb906..f7789ae8e2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Armor Type enumerated. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java similarity index 93% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java index d059efd025..c8a309674f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Crystal Type enumerated. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 93% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index b352bd7fc0..834b0c3996 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * EtcItem Type enumerated. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/ItemType.java similarity index 91% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/ItemType.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/ItemType.java index 8624a506ca..96efd315cc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Created for allow comparing different item types diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java similarity index 91% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java index acd27c9e3e..20c346d197 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Material Type enumerated. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java similarity index 94% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename to L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java index f50a13d010..fdaf0dbe8d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index ffc84ab3a9..77a0e89162 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index c80c5c5dee..2c7a7e18fc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -51,14 +51,14 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 4aedd459e0..0078239bed 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index ac4f02d1ce..7f2dae146c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index c465f8d4ea..6a10ea1945 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java index 1be51cc85c..7d52350cdc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -63,8 +63,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java index 80eec709d8..1e18bcb9ad 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 0c8d1c4e9f..b74ebe74c6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java index ab75417b52..6e65b03682 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 9a8ea5b2a9..7abbc9dc6b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 402c603dac..645156f9c1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ee53743fce..31df739b0f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 0df1e7851f..6520c65fef 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 581b432620..d4043c0c83 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 3eda159a36..c524cb94f1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index ddbf6666c9..c4b2ee6602 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index 45301710ad..e9fb2b0c78 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index bab0af38a8..1c31ff4a11 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index ddd0381e81..33a024f2cf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index d80e5ddedf..6d904ec55d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index ec46a282bf..1e5679950b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 5e39e635f1..0d6677701d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index d6df3726cc..47214311ac 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 9dfcf81ebd..5d4b260a76 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 85dbfd4647..ed78abf81d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index eee07594d3..c67449efed 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 48a67946e9..3ee4350b8d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 34d5e29e1f..b18fc41cde 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 21dcd2d13d..9565b3e5ca 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 6b1a6a94e8..1b20e2e248 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 96d170857a..2330851024 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 7e7abde686..66fb839f0e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index a438e21228..eab1e325f5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 469ee06f48..70e2f43664 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 1ce073af11..14f42293bf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 8626434905..e4376f9ad5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index d92fbb028a..26cfaf9835 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d498c232c5..d66024cc52 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 13b2d241e5..33a10fd20c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index fb025563e6..d7d4d2b449 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 60cfa6b927..6d1eea218a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 4c5880c23a..ee93527570 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 6bc227a559..3de872e222 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 5e34c5bcb7..cd11720237 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index b1f9daa6ca..b42c56a13c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 251b8c7719..964fffd4a3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 6800a418cc..d257cb06cc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AlchemyResult; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 56cf3b84cc..b9a7aadbf7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index 628878dda6..76e42799c4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51f689b277..8b40712b46 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 40099830cf..515bcf4534 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.enums.ItemListType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b15e77740f..cfa4f6759d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 3ec3d494e8..db168592f1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 942a5f1cdc..b739a94c55 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 235c3abacf..29d5eafeef 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 36c50e5a6e..28de208185 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index a8903175db..f212539af7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index b690bd9455..c14caa76e0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 809a864983..395487097c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 8e8db3e29a..bc11ece388 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 7968dc8ef5..b1dec0a155 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index a4961a0e21..80eb9973d1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index f826c75d4b..844fad86c7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index e744eecbdd..8735b315b6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 34e586e3f4..cfb62e583f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index faf957b0c9..d499719f31 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index f27cf60885..bb462b6cd2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index d8f88333df..df50db952f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index ca4a4ee04c..c2fedd99c0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 2395272fd4..89b4b16f97 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 84ee2d06c6..470ce757db 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index bcc376c327..455305ce79 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index fcc27f821d..64fb395dda 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 1cf1f17260..876a24c7ad 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentBase.java index 65e18e4a0e..bcbe96ad19 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -134,9 +137,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 5088f1619d..872e71f3d9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index cde471aff7..27a60e05f3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java index 299274160b..e1f6de3c80 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExGetPremiumItemList; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DragonWeaponListeners.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DragonWeaponListeners.java index 09171d6d97..c50af03d70 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DragonWeaponListeners.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/DragonWeaponListeners.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemEquip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/SiegeGuards.java index 07d6a45613..ea67a6b16c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 69349fc9ef..5f7c45d595 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionCancel; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 9a1bfbc322..4afd6e9f3c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 1ff3d6ae84..ee5c5e5649 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index a1dac8e67f..4a0debf3a8 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 0a82f9968d..35d31315ad 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 59e5b148a1..76d08b7a2b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index dd5c2f593d..2ea2bf9f11 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index f7054e99e9..17d76b1bf6 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d5d2ad10cf..8f4db5d580 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 0ae4fd3481..d7c59f6780 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index a403724d9a..10d1c9e03b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2b6db19588..607dc3b8f5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 7d0f0b43ba..9723633d69 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 4fdcb5ca9a..a4f5e2fc18 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index c6430fd345..8eaf69885f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index bfc65e27f5..879983272a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index d592bba597..96b98f6548 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index aa2eabd231..5690696b29 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 2ed9c1c346..7f5e0e87a1 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index a5cdbefa8b..f534a5ca55 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java index d480511447..c69477f113 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index ecebff8fcf..bbe94f05d2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d55c2897df..a58e246a0d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 742ca00283..3d97c9ac22 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 3eb4d77710..8b4d315b50 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 7e60c89db5..2ca2c2fc70 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 6a58fbf31b..f4ff6be84c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6f313482ab..54230f39a1 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b485046a39..25c237e53f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 410e71cff8..01714d7f5a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index c6528207ac..a0b53bbc44 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 90b5312e92..b860d16e2f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 2472a2d955..85d614b478 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index d1d5c8c332..c2610ec4e3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 6a740915da..f137988e26 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 91b4783b6f..465c7876f3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 5653ea4612..4cf7f101e9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 02629d5d34..e17c4d3c90 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27f0904f0f..a61cc1bd71 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 255f805e72..12f575b243 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index ff9e654e61..3aeadd38a7 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 0ff861388c..75ab0bae7e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java index 2ad8e45099..3f580995d2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 252f6cdb3e..40fb48b033 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java index a9aa767e9b..f7dbd2b655 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java @@ -22,7 +22,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java index b9d21a55ae..40e84f4dd0 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java @@ -19,7 +19,7 @@ package quests.Q00756_TopQualityPetra; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java index 8afc6f6ff9..ceef25c804 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java index 90a68d79e3..075ada8600 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java @@ -18,7 +18,7 @@ package quests.Q10303_CrossroadsBetweenLightAndDarkness; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java index a1ce88bb4a..82d2e66d32 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java index cacdac5efe..5379818de9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.annotations.Id; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerAugment; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java index 7a267f1cec..d152979683 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java @@ -19,8 +19,8 @@ package quests.Q10465_SoulFrostSword; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java index a31abfa83b..b9a18ed239 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java index faa49497bf..3dd42f74db 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/ItemTable.java index 9197c33197..914259543f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index e6a4acdcb5..63e8fac185 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 99e8b8b3d2..1c3099e6c4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index d134fe859e..c57e62c683 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index a65a5752f1..4605f675b5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 4793281033..18a8c90960 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index d2337f0f98..df1c988200 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 0f7be781b2..7bc7be8487 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index ba3ab89b07..20d23bc7fc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 2958e1cba9..f5e48bd424 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -35,9 +35,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 3d21c7ddf0..5f3eb28e8a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ArmorSet.java index 4d11cf0970..a84709e2db 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CombatFlag.java index dc49fce1cc..7385a9fc13 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CursedWeapon.java index f34fda05ad..806375ccc4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Party.java index ec67ca4a4a..5244307c22 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Party.java @@ -45,8 +45,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java index a9796fbbb7..36f3461010 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeList.java index ff44805912..299c136cf4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 98194e05d9..409f05b2db 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java index 7cf1def93c..025f027221 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java index 757412e9b3..ffae01611d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java index 1e767276fc..75caacdbd1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -226,6 +226,16 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; @@ -233,16 +243,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java index 1d10d176ce..3d1b9ef6c2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index b93149d928..0423214997 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b3fac75f08..8f7214b2d0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index bff7d7d596..678412218a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; public class PlayableStat extends CreatureStat diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 890765952c..df8ff31c80 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index da03c6b165..d93e4def4d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 6edc19b444..a62d59b876 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9c053efc5e..ebe8b7499f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 5b4ab6daf1..d68a40ee75 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 85c89d15ec..4c9bc6856c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 68990650dd..c08b648e55 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index bab8b12ab1..9f4fdbdfc9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index 952f083c90..3f89277658 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index b9dbf9922e..099403db9c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.ensoul; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index e0943615ad..aecf7ec87d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -131,15 +131,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index 6366293771..9f5cd48551 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 16644245de..c792f858bb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index 574e07a8e7..a6b878697e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/Armor.java index 6a27c29819..6d53c84197 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/EtcItem.java similarity index 93% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/EtcItem.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/EtcItem.java index af7b9293fb..aada2ffd22 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; /** * This class is dedicated to the management of EtcItem. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/Henna.java similarity index 95% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/Henna.java index 426a12682a..0d1de91388 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.EnumMap; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index d92bf00f39..8aabc7b9aa 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java similarity index 93% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java index c632a41dfb..e9aa728f69 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 91% rename from L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index d47f84330a..e092feea62 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.Collection; import java.util.Objects; @@ -22,9 +22,9 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/Weapon.java similarity index 94% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Weapon.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/Weapon.java index 85bb22d23b..3ae599da0d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java similarity index 90% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java index 54e66a6721..539c32ff6f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java similarity index 90% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java index 183600e31d..a1b472975a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java similarity index 93% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index aafdba599e..4736db96a7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; import java.time.Duration; import java.util.ArrayList; @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java similarity index 90% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java index 0b31f45cd8..a550363da5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java similarity index 90% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java index a6dfe151d7..a52e0900ca 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java similarity index 92% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java index a2897ba911..6f73983c0e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; import java.util.EnumMap; import java.util.Map; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java similarity index 91% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java index f36ed1b5c5..dcfa1d485d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; import org.l2jmobius.gameserver.model.holders.ItemHolder; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java similarity index 90% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java index e1a3a657ad..920fa01cc1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java similarity index 90% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index a09b01d571..8890655085 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java similarity index 94% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java index 7ba1d42d99..27d5d894bd 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.ArrayList; import java.util.List; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java similarity index 90% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java index fb23338d90..6b234768e4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java similarity index 90% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java index 3e17edd870..f46dd28657 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 93% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index 79c0d9c517..28206a00fe 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.stats.Stat; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java similarity index 90% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java index 3a4fff76e5..e1e485672e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java similarity index 89% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java index 13d6b5a2ee..bfe1c295da 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java similarity index 91% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java index c8b8dff6ad..a2f5eaffa7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; +package org.l2jmobius.gameserver.model.item.enchant.attribute; import org.l2jmobius.gameserver.enums.AttributeType; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 17ff1d0f85..404c2aa58a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -69,14 +69,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent; import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/ActionType.java similarity index 91% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/ActionType.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/ActionType.java index 3693ba3816..7ae67f3249 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Action Type enumerated. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java similarity index 91% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java index b0dd4eb906..f7789ae8e2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Armor Type enumerated. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java similarity index 93% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java index d059efd025..c8a309674f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Crystal Type enumerated. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 93% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index b352bd7fc0..834b0c3996 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * EtcItem Type enumerated. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/ItemType.java similarity index 91% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/ItemType.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/ItemType.java index 8624a506ca..96efd315cc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Created for allow comparing different item types diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java similarity index 91% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java index acd27c9e3e..20c346d197 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Material Type enumerated. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java similarity index 94% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename to L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java index f50a13d010..fdaf0dbe8d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index ffc84ab3a9..77a0e89162 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 5f07f4f64f..0945a6d8e9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -51,14 +51,14 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 3492f795a9..1774d79dfb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b71b5635bf..cf8e72eee5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index c465f8d4ea..6a10ea1945 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java index 13f4bb7440..6d7f2eaa78 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java index 80eec709d8..1e18bcb9ad 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 4a6700f0d4..5a5394d5a7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java index ab75417b52..6e65b03682 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 9a8ea5b2a9..7abbc9dc6b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 402c603dac..645156f9c1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ee53743fce..31df739b0f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 0df1e7851f..6520c65fef 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 581b432620..d4043c0c83 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 3eda159a36..c524cb94f1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index ddbf6666c9..c4b2ee6602 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index 45301710ad..e9fb2b0c78 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index de0c583a95..59a7a0e0bb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index ddd0381e81..33a024f2cf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 23cecf46eb..3074ab71f9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -53,7 +53,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 69e9e96acb..0d3203de73 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index f4872a36bb..b7a2c5c6c4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index d6df3726cc..47214311ac 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 9dfcf81ebd..5d4b260a76 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 85dbfd4647..ed78abf81d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index eee07594d3..c67449efed 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 48a67946e9..3ee4350b8d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index c62ccf19a0..d5536eefbe 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 21dcd2d13d..9565b3e5ca 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 6b1a6a94e8..1b20e2e248 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 96d170857a..2330851024 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 7e7abde686..66fb839f0e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index a438e21228..eab1e325f5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 469ee06f48..70e2f43664 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 1ce073af11..14f42293bf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 8626434905..e4376f9ad5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index d92fbb028a..26cfaf9835 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d498c232c5..d66024cc52 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 13b2d241e5..33a10fd20c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index fb025563e6..d7d4d2b449 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 60cfa6b927..6d1eea218a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 4c5880c23a..ee93527570 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 6bc227a559..3de872e222 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 006ba36f32..f1d523385c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index b1f9daa6ca..b42c56a13c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 251b8c7719..964fffd4a3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 6800a418cc..d257cb06cc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AlchemyResult; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index f144094dda..95a85c269b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 56cf3b84cc..b9a7aadbf7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index e8f3c75825..912dae684a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index 628878dda6..76e42799c4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51f689b277..8b40712b46 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 7291585306..049207d876 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b15e77740f..cfa4f6759d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 3ec3d494e8..db168592f1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 942a5f1cdc..b739a94c55 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 235c3abacf..29d5eafeef 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 1092726054..602a9260ce 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index a8903175db..f212539af7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index b690bd9455..c14caa76e0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 809a864983..395487097c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index e12343f308..191537b4e7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index a100b5cec6..13b7decd2c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 647fc249e5..def8687969 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index f826c75d4b..844fad86c7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index e744eecbdd..8735b315b6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 68280350e5..21d0020372 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index faf957b0c9..d499719f31 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index f27cf60885..bb462b6cd2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index d8f88333df..df50db952f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index ca4a4ee04c..c2fedd99c0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 2395272fd4..89b4b16f97 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 84ee2d06c6..470ce757db 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index bcc376c327..455305ce79 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index fcc27f821d..64fb395dda 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 1cf1f17260..876a24c7ad 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/DocumentBase.java index 65e18e4a0e..bcbe96ad19 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -134,9 +137,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 5088f1619d..872e71f3d9 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index cde471aff7..27a60e05f3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java index 299274160b..e1f6de3c80 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExGetPremiumItemList; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DragonWeaponListeners.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DragonWeaponListeners.java index 09171d6d97..c50af03d70 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DragonWeaponListeners.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/DragonWeaponListeners.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemEquip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/SiegeGuards.java index 07d6a45613..ea67a6b16c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 69349fc9ef..5f7c45d595 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionCancel; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 9a1bfbc322..4afd6e9f3c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 1ff3d6ae84..ee5c5e5649 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index a1dac8e67f..4a0debf3a8 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 0a82f9968d..35d31315ad 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 59e5b148a1..76d08b7a2b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index dd5c2f593d..2ea2bf9f11 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index f7054e99e9..17d76b1bf6 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d5d2ad10cf..8f4db5d580 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 0ae4fd3481..d7c59f6780 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index a403724d9a..10d1c9e03b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2b6db19588..607dc3b8f5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 7d0f0b43ba..9723633d69 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 4fdcb5ca9a..a4f5e2fc18 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index c6430fd345..8eaf69885f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index bfc65e27f5..879983272a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index d592bba597..96b98f6548 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index aa2eabd231..5690696b29 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 705ed225aa..a74d84251f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index a5cdbefa8b..f534a5ca55 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java index d480511447..c69477f113 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index ecebff8fcf..bbe94f05d2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d55c2897df..a58e246a0d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 742ca00283..3d97c9ac22 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 3eb4d77710..8b4d315b50 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 7e60c89db5..2ca2c2fc70 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 6a58fbf31b..f4ff6be84c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6f313482ab..54230f39a1 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b485046a39..25c237e53f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 410e71cff8..01714d7f5a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index c6528207ac..a0b53bbc44 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 90b5312e92..b860d16e2f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 2472a2d955..85d614b478 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index d1d5c8c332..c2610ec4e3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 6a740915da..f137988e26 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 91b4783b6f..465c7876f3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 5653ea4612..4cf7f101e9 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java index ef282584ac..03e791c09f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 02629d5d34..e17c4d3c90 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27f0904f0f..a61cc1bd71 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 255f805e72..12f575b243 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index ff9e654e61..3aeadd38a7 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 0ff861388c..75ab0bae7e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java index 2ad8e45099..3f580995d2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 252f6cdb3e..40fb48b033 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java index a9aa767e9b..f7dbd2b655 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java @@ -22,7 +22,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java index b9d21a55ae..40e84f4dd0 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java @@ -19,7 +19,7 @@ package quests.Q00756_TopQualityPetra; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java index 948d7b6127..b5fee1d434 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java index 90a68d79e3..075ada8600 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java @@ -18,7 +18,7 @@ package quests.Q10303_CrossroadsBetweenLightAndDarkness; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java index 880cbddbb1..8f6fbc81e8 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java index 02034620c9..26bd532b3f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.annotations.Id; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerAugment; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java index 0bc0759fbe..c5e88e36f4 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java @@ -19,8 +19,8 @@ package quests.Q10465_SoulFrostSword; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java index a31abfa83b..b9a18ed239 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java index faa49497bf..3dd42f74db 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/ItemTable.java index 9197c33197..914259543f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index e6a4acdcb5..63e8fac185 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 99e8b8b3d2..1c3099e6c4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index d134fe859e..c57e62c683 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index a65a5752f1..4605f675b5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 4793281033..18a8c90960 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index d2337f0f98..df1c988200 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 0f7be781b2..7bc7be8487 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index ba3ab89b07..20d23bc7fc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 2958e1cba9..f5e48bd424 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -35,9 +35,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 3d21c7ddf0..5f3eb28e8a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ArmorSet.java index 4d11cf0970..a84709e2db 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CombatFlag.java index dc49fce1cc..7385a9fc13 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CursedWeapon.java index f34fda05ad..806375ccc4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Party.java index ec67ca4a4a..5244307c22 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Party.java @@ -45,8 +45,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java index a9796fbbb7..36f3461010 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeList.java index ff44805912..299c136cf4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 98194e05d9..409f05b2db 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java index f15123695b..6d18d4f603 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java index 757412e9b3..ffae01611d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java index adde7deff7..238af50015 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -227,6 +227,16 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; @@ -234,16 +244,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java index 1d10d176ce..3d1b9ef6c2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index b93149d928..0423214997 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b3fac75f08..8f7214b2d0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index bff7d7d596..678412218a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; public class PlayableStat extends CreatureStat diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 890765952c..df8ff31c80 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index da03c6b165..d93e4def4d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 6edc19b444..a62d59b876 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9c053efc5e..ebe8b7499f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 5b4ab6daf1..d68a40ee75 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 85c89d15ec..4c9bc6856c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 68990650dd..c08b648e55 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index bab8b12ab1..9f4fdbdfc9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index 952f083c90..3f89277658 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index b9dbf9922e..099403db9c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.ensoul; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 2f1424657f..b5b9ac8025 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -132,15 +132,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index e5acbd2a22..054643ceae 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 16644245de..c792f858bb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index 574e07a8e7..a6b878697e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/Armor.java index 6a27c29819..6d53c84197 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/EtcItem.java similarity index 93% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/EtcItem.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/EtcItem.java index af7b9293fb..aada2ffd22 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; /** * This class is dedicated to the management of EtcItem. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/Henna.java similarity index 95% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/Henna.java index 426a12682a..0d1de91388 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.EnumMap; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index d92bf00f39..8aabc7b9aa 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java similarity index 93% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java index c632a41dfb..e9aa728f69 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 91% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index d47f84330a..e092feea62 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.Collection; import java.util.Objects; @@ -22,9 +22,9 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/Weapon.java similarity index 94% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Weapon.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/Weapon.java index 85bb22d23b..3ae599da0d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java similarity index 90% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java index 54e66a6721..539c32ff6f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java similarity index 90% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java index 183600e31d..a1b472975a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java similarity index 93% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index aafdba599e..4736db96a7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; import java.time.Duration; import java.util.ArrayList; @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java similarity index 90% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java index 0b31f45cd8..a550363da5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java similarity index 90% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java index a6dfe151d7..a52e0900ca 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java similarity index 92% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java index a2897ba911..6f73983c0e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; import java.util.EnumMap; import java.util.Map; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java similarity index 91% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java index f36ed1b5c5..dcfa1d485d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; import org.l2jmobius.gameserver.model.holders.ItemHolder; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java similarity index 90% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java index e1a3a657ad..920fa01cc1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java similarity index 90% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index a09b01d571..8890655085 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java similarity index 94% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java index 7ba1d42d99..27d5d894bd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.ArrayList; import java.util.List; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java similarity index 90% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java index fb23338d90..6b234768e4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java similarity index 90% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java index 3e17edd870..f46dd28657 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 93% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index 79c0d9c517..28206a00fe 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.stats.Stat; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java similarity index 90% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java index 3a4fff76e5..e1e485672e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java similarity index 89% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java index 13d6b5a2ee..bfe1c295da 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java similarity index 91% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java index c8b8dff6ad..a2f5eaffa7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; +package org.l2jmobius.gameserver.model.item.enchant.attribute; import org.l2jmobius.gameserver.enums.AttributeType; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 17ff1d0f85..404c2aa58a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -69,14 +69,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent; import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/ActionType.java similarity index 91% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/ActionType.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/ActionType.java index 3693ba3816..7ae67f3249 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Action Type enumerated. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java similarity index 91% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java index b0dd4eb906..f7789ae8e2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Armor Type enumerated. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java similarity index 93% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java index d059efd025..c8a309674f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Crystal Type enumerated. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 93% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index b352bd7fc0..834b0c3996 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * EtcItem Type enumerated. diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/ItemType.java similarity index 91% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/ItemType.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/ItemType.java index 8624a506ca..96efd315cc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Created for allow comparing different item types diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java similarity index 91% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java index acd27c9e3e..20c346d197 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Material Type enumerated. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java similarity index 94% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename to L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java index f50a13d010..fdaf0dbe8d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index ffc84ab3a9..77a0e89162 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 5f07f4f64f..0945a6d8e9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -51,14 +51,14 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 3492f795a9..1774d79dfb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b71b5635bf..cf8e72eee5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index c465f8d4ea..6a10ea1945 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java index cb0ec3ca27..e8dd71c8f4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -65,8 +65,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java index 80eec709d8..1e18bcb9ad 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 4a6700f0d4..5a5394d5a7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java index ab75417b52..6e65b03682 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 9a8ea5b2a9..7abbc9dc6b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 402c603dac..645156f9c1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ee53743fce..31df739b0f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 0df1e7851f..6520c65fef 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 581b432620..d4043c0c83 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 3eda159a36..c524cb94f1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index ddbf6666c9..c4b2ee6602 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index 45301710ad..e9fb2b0c78 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index de0c583a95..59a7a0e0bb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index ddd0381e81..33a024f2cf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 23cecf46eb..3074ab71f9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -53,7 +53,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 69e9e96acb..0d3203de73 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index f4872a36bb..b7a2c5c6c4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index d6df3726cc..47214311ac 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 9dfcf81ebd..5d4b260a76 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 85dbfd4647..ed78abf81d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index eee07594d3..c67449efed 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 48a67946e9..3ee4350b8d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index c62ccf19a0..d5536eefbe 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 21dcd2d13d..9565b3e5ca 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 6b1a6a94e8..1b20e2e248 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 96d170857a..2330851024 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 7e7abde686..66fb839f0e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index a438e21228..eab1e325f5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 469ee06f48..70e2f43664 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 1ce073af11..14f42293bf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 8626434905..e4376f9ad5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index d92fbb028a..26cfaf9835 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d498c232c5..d66024cc52 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 13b2d241e5..33a10fd20c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index fb025563e6..d7d4d2b449 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 9bddf5f507..19a6780f98 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 4c5880c23a..ee93527570 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 6bc227a559..3de872e222 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 4d836680da..0bf083a345 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index b1f9daa6ca..b42c56a13c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 251b8c7719..964fffd4a3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 6800a418cc..d257cb06cc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AlchemyResult; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index f144094dda..95a85c269b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 56cf3b84cc..b9a7aadbf7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index e8f3c75825..912dae684a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index 628878dda6..76e42799c4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51f689b277..8b40712b46 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index a80a619158..9964cd1f64 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b15e77740f..cfa4f6759d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 3ec3d494e8..db168592f1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 942a5f1cdc..b739a94c55 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 235c3abacf..29d5eafeef 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c5c1d1141..81a384642c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index a8903175db..f212539af7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index b690bd9455..c14caa76e0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 809a864983..395487097c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 2fe9967302..30dc837721 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 6691a8ea4f..cf3d83263f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 97b7b53cae..cb1379ac29 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index f826c75d4b..844fad86c7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index e744eecbdd..8735b315b6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 8fbd06fc5f..d9901a9961 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index faf957b0c9..d499719f31 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index f27cf60885..bb462b6cd2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index d8f88333df..df50db952f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index ca4a4ee04c..c2fedd99c0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index d48b66c6ef..9d9b24a54f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 84ee2d06c6..470ce757db 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index bcc376c327..455305ce79 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index fcc27f821d..64fb395dda 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 1cf1f17260..876a24c7ad 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/DocumentBase.java index 65e18e4a0e..bcbe96ad19 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -134,9 +137,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 5088f1619d..872e71f3d9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index cde471aff7..27a60e05f3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java index 299274160b..e1f6de3c80 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExGetPremiumItemList; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DragonWeaponListeners.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DragonWeaponListeners.java index 09171d6d97..c50af03d70 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DragonWeaponListeners.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/DragonWeaponListeners.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemEquip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/SiegeGuards.java index 07d6a45613..ea67a6b16c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 69349fc9ef..5f7c45d595 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionCancel; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 9a1bfbc322..4afd6e9f3c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 1ff3d6ae84..ee5c5e5649 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index a1dac8e67f..4a0debf3a8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 0a82f9968d..35d31315ad 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 59e5b148a1..76d08b7a2b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index dd5c2f593d..2ea2bf9f11 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index f7054e99e9..17d76b1bf6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d5d2ad10cf..8f4db5d580 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 0ae4fd3481..d7c59f6780 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index a403724d9a..10d1c9e03b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index ab33e22a5f..adc092f771 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 31621251be..62d5debb32 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index a2dc3f75fd..1bd311ede1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index fae553ff45..991d2217b5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 7d0f0b43ba..9723633d69 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 4fdcb5ca9a..a4f5e2fc18 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index c6430fd345..8eaf69885f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index bfc65e27f5..879983272a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index d592bba597..96b98f6548 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index aa2eabd231..5690696b29 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 705ed225aa..a74d84251f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index a5cdbefa8b..f534a5ca55 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java index d480511447..c69477f113 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index ecebff8fcf..bbe94f05d2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d55c2897df..a58e246a0d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 8f81770a04..53f0529429 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index af19b2276d..ded8b9bcbc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 7e60c89db5..2ca2c2fc70 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 6a58fbf31b..f4ff6be84c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java index e4245a37c1..f05c5a48b9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6f313482ab..54230f39a1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b485046a39..25c237e53f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 410e71cff8..01714d7f5a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index c6528207ac..a0b53bbc44 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 90b5312e92..b860d16e2f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 2472a2d955..85d614b478 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index d1d5c8c332..c2610ec4e3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 6a740915da..f137988e26 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 91b4783b6f..465c7876f3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 5653ea4612..4cf7f101e9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java index ef282584ac..03e791c09f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 4db0961a07..416fa8a65a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27f0904f0f..a61cc1bd71 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 255f805e72..12f575b243 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index ff9e654e61..3aeadd38a7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 0ff861388c..75ab0bae7e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java index 2ad8e45099..3f580995d2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 252f6cdb3e..40fb48b033 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java index a9aa767e9b..f7dbd2b655 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java @@ -22,7 +22,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java index b9d21a55ae..40e84f4dd0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java @@ -19,7 +19,7 @@ package quests.Q00756_TopQualityPetra; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java index 948d7b6127..b5fee1d434 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java index 90a68d79e3..075ada8600 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java @@ -18,7 +18,7 @@ package quests.Q10303_CrossroadsBetweenLightAndDarkness; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java index 880cbddbb1..8f6fbc81e8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java index 02034620c9..26bd532b3f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10462_TemperARustingBlade/Q10462_TemperARustingBlade.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.annotations.Id; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerAugment; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java index 0bc0759fbe..c5e88e36f4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10465_SoulFrostSword/Q10465_SoulFrostSword.java @@ -19,8 +19,8 @@ package quests.Q10465_SoulFrostSword; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java index a31abfa83b..b9a18ed239 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java index faa49497bf..3dd42f74db 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/ItemTable.java index 9197c33197..914259543f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index e6a4acdcb5..63e8fac185 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 99e8b8b3d2..1c3099e6c4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index a213d965da..cab4dfa0e9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 4793281033..18a8c90960 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index d2337f0f98..df1c988200 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 0f7be781b2..7bc7be8487 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index ba3ab89b07..20d23bc7fc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 3d21c7ddf0..5f3eb28e8a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ArmorSet.java index 4d11cf0970..a84709e2db 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CombatFlag.java index dc49fce1cc..7385a9fc13 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CursedWeapon.java index f34fda05ad..806375ccc4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java index ec67ca4a4a..5244307c22 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java @@ -45,8 +45,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Seed.java index 13caeeb575..2dc7f967bb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java index a9796fbbb7..36f3461010 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeList.java index ba25090b4c..27c50e5787 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 98194e05d9..409f05b2db 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java index f15123695b..6d18d4f603 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java index 757412e9b3..ffae01611d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java index e5a07f58a0..f775f47fde 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -228,6 +228,17 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; @@ -235,17 +246,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java index 1d10d176ce..3d1b9ef6c2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index b93149d928..0423214997 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b3fac75f08..8f7214b2d0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index bff7d7d596..678412218a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; public class PlayableStat extends CreatureStat diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 624c0121ea..a4cd7011cc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index da03c6b165..d93e4def4d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 6edc19b444..a62d59b876 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9c053efc5e..ebe8b7499f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 5b4ab6daf1..d68a40ee75 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 85c89d15ec..4c9bc6856c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 68990650dd..c08b648e55 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index 952f083c90..3f89277658 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 2f1424657f..b5b9ac8025 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -132,15 +132,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index e5acbd2a22..054643ceae 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 16644245de..c792f858bb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index 574e07a8e7..a6b878697e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/Armor.java index 6a27c29819..6d53c84197 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/EtcItem.java similarity index 93% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/EtcItem.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/EtcItem.java index af7b9293fb..aada2ffd22 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; /** * This class is dedicated to the management of EtcItem. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/Henna.java similarity index 95% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/Henna.java index 426a12682a..0d1de91388 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.EnumMap; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index 200586e561..588282fbda 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java similarity index 93% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java index c632a41dfb..e9aa728f69 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ItemHolder; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 91% rename from L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index d47f84330a..e092feea62 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.Collection; import java.util.Objects; @@ -22,9 +22,9 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/Weapon.java similarity index 94% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/Weapon.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/Weapon.java index 85bb22d23b..3ae599da0d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java similarity index 90% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java index 54e66a6721..539c32ff6f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java similarity index 90% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java index 183600e31d..a1b472975a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java similarity index 93% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index aafdba599e..4736db96a7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; import java.time.Duration; import java.util.ArrayList; @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java similarity index 90% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java index 0b31f45cd8..a550363da5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java similarity index 90% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java index a6dfe151d7..a52e0900ca 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java similarity index 92% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java index a2897ba911..6f73983c0e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; import java.util.EnumMap; import java.util.Map; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java similarity index 91% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java index f36ed1b5c5..dcfa1d485d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; import org.l2jmobius.gameserver.model.holders.ItemHolder; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java similarity index 90% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java index e1a3a657ad..920fa01cc1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java similarity index 90% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 6745b1d5e4..76176d2ab3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java similarity index 94% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java index 7ba1d42d99..27d5d894bd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.ArrayList; import java.util.List; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java similarity index 90% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java index fb23338d90..6b234768e4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java similarity index 90% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java index 3e17edd870..f46dd28657 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 93% rename from L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index f543c70ebd..ea29d773db 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.stats.Stat; /** diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java similarity index 90% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java index 3a4fff76e5..e1e485672e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java similarity index 90% rename from L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java index 12b33e468f..308f08c38b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java similarity index 91% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java index c8b8dff6ad..a2f5eaffa7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; +package org.l2jmobius.gameserver.model.item.enchant.attribute; import org.l2jmobius.gameserver.enums.AttributeType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java index f891d3f3bc..4c2b67c766 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -69,14 +69,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent; import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/ActionType.java similarity index 91% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/ActionType.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/ActionType.java index 3693ba3816..7ae67f3249 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Action Type enumerated. diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java similarity index 91% rename from L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java index b0dd4eb906..f7789ae8e2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Armor Type enumerated. diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java similarity index 94% rename from L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java index b9c20b90ae..7fef025a56 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Crystal Type enumerated. diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 93% rename from L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index 5730665d9f..c9c153923e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * EtcItem Type enumerated. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/ItemType.java similarity index 91% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/ItemType.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/ItemType.java index 8624a506ca..96efd315cc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Created for allow comparing different item types diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java similarity index 91% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java index acd27c9e3e..20c346d197 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Material Type enumerated. diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java similarity index 94% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename to L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java index f50a13d010..fdaf0dbe8d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 8323d4bdc7..06760564d7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index d0c4af404c..e102902e82 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -51,14 +51,14 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 3492f795a9..1774d79dfb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 36ec6f7eea..7949396130 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index c465f8d4ea..6a10ea1945 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java index 5f3d83eb7d..bdf8218191 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -65,8 +65,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java index 80eec709d8..1e18bcb9ad 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 4a6700f0d4..5a5394d5a7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java index ab75417b52..6e65b03682 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 9a8ea5b2a9..7abbc9dc6b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 402c603dac..645156f9c1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ee53743fce..31df739b0f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 0df1e7851f..6520c65fef 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 581b432620..d4043c0c83 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 3eda159a36..c524cb94f1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index ddbf6666c9..c4b2ee6602 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index 45301710ad..e9fb2b0c78 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index de0c583a95..59a7a0e0bb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index ddd0381e81..33a024f2cf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 1591e9cf3c..f66bf7ca6c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -53,7 +53,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 69e9e96acb..0d3203de73 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index f4872a36bb..b7a2c5c6c4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index d6df3726cc..47214311ac 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 9dfcf81ebd..5d4b260a76 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 85dbfd4647..ed78abf81d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index eee07594d3..c67449efed 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 48a67946e9..3ee4350b8d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index f921663f30..291c9135f8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 21dcd2d13d..9565b3e5ca 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 6b1a6a94e8..1b20e2e248 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 96d170857a..2330851024 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 7e7abde686..66fb839f0e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index a438e21228..eab1e325f5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 469ee06f48..70e2f43664 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 1ce073af11..14f42293bf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 8626434905..e4376f9ad5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index d92fbb028a..26cfaf9835 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d498c232c5..d66024cc52 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 35f568fc0b..0ab9577343 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 9f321c1803..7ca2a01f2e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 13b2d241e5..33a10fd20c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index fb025563e6..d7d4d2b449 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 9bddf5f507..19a6780f98 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 4c5880c23a..ee93527570 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 6bc227a559..3de872e222 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 4d836680da..0bf083a345 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index b1f9daa6ca..b42c56a13c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 251b8c7719..964fffd4a3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 6800a418cc..d257cb06cc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AlchemyResult; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index f144094dda..95a85c269b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index e7a8e8baf6..7fbd7ebecb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 56cf3b84cc..b9a7aadbf7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index e8f3c75825..912dae684a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index 628878dda6..76e42799c4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51f689b277..8b40712b46 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index a80a619158..9964cd1f64 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 3ec3d494e8..db168592f1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 942a5f1cdc..b739a94c55 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 235c3abacf..29d5eafeef 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c5c1d1141..81a384642c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index a8903175db..f212539af7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index b690bd9455..c14caa76e0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 809a864983..395487097c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 2fe9967302..30dc837721 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 6691a8ea4f..cf3d83263f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 97b7b53cae..cb1379ac29 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index f826c75d4b..844fad86c7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index e744eecbdd..8735b315b6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index a5616075a6..e1da19cc8f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index faf957b0c9..d499719f31 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index f27cf60885..bb462b6cd2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index c49a1d369f..4d605cfbb4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index d48b66c6ef..9d9b24a54f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 84ee2d06c6..470ce757db 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index bcc376c327..455305ce79 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index fcc27f821d..64fb395dda 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 1cf1f17260..876a24c7ad 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentBase.java index 65e18e4a0e..bcbe96ad19 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -134,9 +137,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 5088f1619d..872e71f3d9 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index cde471aff7..27a60e05f3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java index 299274160b..e1f6de3c80 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExGetPremiumItemList; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DragonWeaponListeners.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DragonWeaponListeners.java index 09171d6d97..c50af03d70 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DragonWeaponListeners.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/DragonWeaponListeners.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemEquip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/SiegeGuards.java index 07d6a45613..ea67a6b16c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 69349fc9ef..5f7c45d595 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionCancel; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 418ed93b2a..4081019df2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 5b1db54836..e7113941ec 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index f73f3c2e73..5d3caadfd5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 0a82f9968d..35d31315ad 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 59e5b148a1..76d08b7a2b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index dd5c2f593d..2ea2bf9f11 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index f7054e99e9..17d76b1bf6 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d5d2ad10cf..8f4db5d580 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 0ae4fd3481..d7c59f6780 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 791bec47b7..39f4aa7422 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index ab33e22a5f..adc092f771 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 31621251be..62d5debb32 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index a2dc3f75fd..1bd311ede1 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index fae553ff45..991d2217b5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 7d0f0b43ba..9723633d69 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 437b502a95..b8985f0fef 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 16e5d6ee8e..eabd0e3d70 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java index 2e2e322e86..6183d5637e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index bfc65e27f5..879983272a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index d592bba597..96b98f6548 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index aa2eabd231..5690696b29 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 705ed225aa..a74d84251f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index a5cdbefa8b..f534a5ca55 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java index d480511447..c69477f113 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index ecebff8fcf..bbe94f05d2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d55c2897df..a58e246a0d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java index 06f3fb2e45..4e0e25e56f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 8f81770a04..53f0529429 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index af19b2276d..ded8b9bcbc 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 7e60c89db5..2ca2c2fc70 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 6a58fbf31b..f4ff6be84c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java index e4245a37c1..f05c5a48b9 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java index 30b8b4d117..b5739976ad 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6f313482ab..54230f39a1 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b485046a39..25c237e53f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 410e71cff8..01714d7f5a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java index 0767b28991..6c95915b62 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index c6528207ac..a0b53bbc44 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 90b5312e92..b860d16e2f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 2472a2d955..85d614b478 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index d1d5c8c332..c2610ec4e3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 6a740915da..f137988e26 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 91b4783b6f..465c7876f3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 028faeb950..3f52aaa7cb 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java index ef282584ac..03e791c09f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 4db0961a07..416fa8a65a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27f0904f0f..a61cc1bd71 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 255f805e72..12f575b243 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index ff9e654e61..3aeadd38a7 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 77b9a03185..c0d47bc8de 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java index 2ad8e45099..3f580995d2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 252f6cdb3e..40fb48b033 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java index a9aa767e9b..f7dbd2b655 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java @@ -22,7 +22,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java index b9d21a55ae..40e84f4dd0 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java @@ -19,7 +19,7 @@ package quests.Q00756_TopQualityPetra; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java index 948d7b6127..b5fee1d434 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java index 90a68d79e3..075ada8600 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java @@ -18,7 +18,7 @@ package quests.Q10303_CrossroadsBetweenLightAndDarkness; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java index 880cbddbb1..8f6fbc81e8 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java index a31abfa83b..b9a18ed239 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java index faa49497bf..3dd42f74db 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/ItemTable.java index 71e95065ef..4c3a4ba842 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index d508b71aef..fd2a491d66 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 99e8b8b3d2..1c3099e6c4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index a213d965da..cab4dfa0e9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java index 426e9dd06f..6c261d6ded 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 4793281033..18a8c90960 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index 35abdf9c02..a6f2465447 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 179b4467c3..2ce3e815cc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index ba3ab89b07..20d23bc7fc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 3d21c7ddf0..5f3eb28e8a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ArmorSet.java index 4d11cf0970..a84709e2db 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CombatFlag.java index 1653677aa1..319f20ea33 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 1d4e48803c..8538779211 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java index 5b309bb46b..0936598410 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Seed.java index 13caeeb575..2dc7f967bb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java index a9796fbbb7..36f3461010 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeList.java index bbafcb1416..bea714862c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 444300d459..112976ec82 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -63,8 +63,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java index 4f2c1f0058..c52e6f0125 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java index 757412e9b3..ffae01611d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java index 1f0abaec85..dc6327b21e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -228,23 +228,23 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java index 1d10d176ce..3d1b9ef6c2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 30927aff20..963ae86e8d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b3fac75f08..8f7214b2d0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index bff7d7d596..678412218a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; public class PlayableStat extends CreatureStat diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index bbef689d53..748bd657db 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index da03c6b165..d93e4def4d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 6edc19b444..a62d59b876 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9c053efc5e..ebe8b7499f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 5b4ab6daf1..d68a40ee75 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 85c89d15ec..4c9bc6856c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 68990650dd..c08b648e55 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index a5fea7c6f6..347f281026 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 2f1424657f..b5b9ac8025 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -132,15 +132,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java index f65fcabe54..e0317b1c0a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java index 780dbd83e4..51ec6c9e3d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java index 81e8c9eb16..bf1d1237f1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index af538045b8..d391a4faf1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 79c69f739d..41f554b9e0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index 574e07a8e7..a6b878697e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java index d01b97cc2c..fcd3b7c0ba 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.model.TradeItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Armor.java index 72b1f27d0b..58945b9cee 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Henna.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Henna.java new file mode 100644 index 0000000000..0d1de91388 --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -0,0 +1,183 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; + +/** + * Class for the Henna object. + * @author Zoey76 + */ +public class Henna +{ + private final int _dyeId; + private final int _dyeItemId; + private final boolean _isPremium; + private final Map _baseStats = new EnumMap<>(BaseStat.class); + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final int _duration; + private final List _skills; + private final List _wearClass; + + public Henna(StatSet set) + { + _dyeId = set.getInt("dyeId"); + _dyeItemId = set.getInt("dyeItemId"); + _isPremium = set.getBoolean("isPremium", false); + _baseStats.put(BaseStat.STR, set.getInt("str", 0)); + _baseStats.put(BaseStat.CON, set.getInt("con", 0)); + _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); + _baseStats.put(BaseStat.INT, set.getInt("int", 0)); + _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); + _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); + _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); + _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _duration = set.getInt("duration", -1); + _skills = new ArrayList<>(); + _wearClass = new ArrayList<>(); + } + + /** + * @return the dye Id. + */ + public int getDyeId() + { + return _dyeId; + } + + /** + * @return the item Id, required for this dye. + */ + public int getDyeItemId() + { + return _dyeItemId; + } + + /** + * @return true if this dye is premium. + */ + public boolean isPremium() + { + return _isPremium; + } + + public int getBaseStats(BaseStat stat) + { + return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); + } + + public Map getBaseStats() + { + return _baseStats; + } + + /** + * @return the wear fee, cost for adding this dye to the player. + */ + public int getWearFee() + { + return _wearFee; + } + + /** + * @return the wear count, the required count to add this dye to the player. + */ + public int getWearCount() + { + return _wearCount; + } + + /** + * @return the cancel fee, cost for removing this dye from the player. + */ + public int getCancelFee() + { + return _cancelFee; + } + + /** + * @return the cancel count, the retrieved amount of dye items after removing the dye. + */ + public int getCancelCount() + { + return _cancelCount; + } + + /** + * @return the duration of this dye. + */ + public int getDuration() + { + return _duration; + } + + /** + * @param skillList the list of skills related to this dye. + */ + public void setSkills(List skillList) + { + _skills.addAll(skillList); + } + + /** + * @return the skills related to this dye. + */ + public List getSkills() + { + return _skills; + } + + /** + * @return the list with the allowed classes to wear this dye. + */ + public List getAllowedWearClass() + { + return _wearClass; + } + + /** + * @param classId the class trying to wear this dye. + * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. + */ + public boolean isAllowedClass(ClassId classId) + { + return _wearClass.contains(classId); + } + + /** + * @param wearClassIds the list of classes that can wear this dye. + */ + public void setWearClassIds(List wearClassIds) + { + _wearClass.addAll(wearClassIds); + } +} \ No newline at end of file diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index 3a6dca768a..f78aa7d493 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 91% rename from L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index 5618132356..b289fa70ae 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.Collection; import java.util.Objects; @@ -22,9 +22,9 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Weapon.java new file mode 100644 index 0000000000..3ae599da0d --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -0,0 +1,311 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.enums.ItemSkillType; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is dedicated to the management of weapons. + */ +public class Weapon extends ItemTemplate +{ + private WeaponType _type; + private boolean _isMagicWeapon; + private int _soulShotCount; + private int _spiritShotCount; + private int _mpConsume; + private int _baseAttackRange; + private int _baseAttackRadius; + private int _baseAttackAngle; + private int _changeWeaponId; + + private int _reducedSoulshot; + private int _reducedSoulshotChance; + + private int _reducedMpConsume; + private int _reducedMpConsumeChance; + + private boolean _isForceEquip; + private boolean _isAttackWeapon; + private boolean _useWeaponSkillsOnly; + + /** + * Constructor for Weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. + */ + public Weapon(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_WEAPON; + _isMagicWeapon = set.getBoolean("is_magic_weapon", false); + _soulShotCount = set.getInt("soulshots", 0); + _spiritShotCount = set.getInt("spiritshots", 0); + _mpConsume = set.getInt("mp_consume", 0); + _baseAttackRange = set.getInt("attack_range", 40); + final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) + { + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + } + else + { + _baseAttackRadius = 40; + _baseAttackAngle = 240; // 360 - 120 + } + + final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); + _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; + _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; + + final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); + _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; + _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; + _changeWeaponId = set.getInt("change_weaponId", 0); + _isForceEquip = set.getBoolean("isForceEquip", false); + _isAttackWeapon = set.getBoolean("isAttackWeapon", true); + _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); + } + + /** + * @return the type of Weapon + */ + @Override + public WeaponType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + @Override + public boolean isWeapon() + { + return true; + } + + /** + * @return {@code true} if the weapon is magic, {@code false} otherwise. + */ + @Override + public boolean isMagicWeapon() + { + return _isMagicWeapon; + } + + /** + * @return the quantity of SoulShot used. + */ + public int getSoulShotCount() + { + return _soulShotCount; + } + + /** + * @return the quantity of SpiritShot used. + */ + public int getSpiritShotCount() + { + return _spiritShotCount; + } + + /** + * @return the reduced quantity of SoultShot used. + */ + public int getReducedSoulShot() + { + return _reducedSoulshot; + } + + /** + * @return the chance to use Reduced SoultShot. + */ + public int getReducedSoulShotChance() + { + return _reducedSoulshotChance; + } + + /** + * @return the MP consumption with the weapon. + */ + public int getMpConsume() + { + return _mpConsume; + } + + public int getBaseAttackRange() + { + return _baseAttackRange; + } + + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + + /** + * @return the reduced MP consumption with the weapon. + */ + public int getReducedMpConsume() + { + return _reducedMpConsume; + } + + /** + * @return the chance to use getReducedMpConsume() + */ + public int getReducedMpConsumeChance() + { + return _reducedMpConsumeChance; + } + + /** + * @return the Id in which weapon this weapon can be changed. + */ + public int getChangeWeaponId() + { + return _changeWeaponId; + } + + /** + * @return {@code true} if the weapon is force equip, {@code false} otherwise. + */ + public boolean isForceEquip() + { + return _isForceEquip; + } + + /** + * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. + */ + public boolean isAttackWeapon() + { + return _isAttackWeapon; + } + + /** + * @return {@code true} if the weapon is skills only, {@code false} otherwise. + */ + public boolean useWeaponSkillsOnly() + { + return _useWeaponSkillsOnly; + } + + /** + * @param caster the Creature pointing out the caster + * @param target the Creature pointing out the target + * @param trigger + * @param type + */ + public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) + { + forEachSkill(type, holder -> + { + final Skill skill = holder.getSkill(); + if (Rnd.get(100) >= holder.getChance()) + { + return; + } + + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // Trigger only if both are good or bad magic. + if (trigger.isBad() != skill.isBad()) + { + return; + } + + // No Trigger if not Magic Skill or is toggle + if (trigger.isMagic() != skill.isMagic()) + { + return; + } + + // No Trigger if skill is toggle + if (trigger.isToggle()) + { + return; + } + + if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) + { + return; + } + } + + // Skill condition not met + if (!skill.checkCondition(caster, target)) + { + return; + } + + skill.activateSkill(caster, target); + + // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // notify quests of a skill use + if (caster.isPlayer()) + { + World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); + } + if (caster.isPlayer()) + { + final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); + sm.addSkillName(skill); + caster.sendPacket(sm); + } + } + }); + } +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java similarity index 93% rename from L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java rename to L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index a568389489..610e720125 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; import java.time.Duration; import java.util.ArrayList; @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java new file mode 100644 index 0000000000..6f73983c0e --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -0,0 +1,65 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import java.util.EnumMap; +import java.util.Map; + +import org.l2jmobius.gameserver.model.StatSet; + +/** + * @author UnAfraid + */ +public class CombinationItem +{ + private final int _itemOne; + private final int _itemTwo; + private final int _chance; + private final Map _rewards = new EnumMap<>(CombinationItemType.class); + + public CombinationItem(StatSet set) + { + _itemOne = set.getInt("one"); + _itemTwo = set.getInt("two"); + _chance = set.getInt("chance"); + } + + public int getItemOne() + { + return _itemOne; + } + + public int getItemTwo() + { + return _itemTwo; + } + + public int getChance() + { + return _chance; + } + + public void addReward(CombinationItemReward item) + { + _rewards.put(item.getType(), item); + } + + public CombinationItemReward getReward(CombinationItemType type) + { + return _rewards.get(type); + } +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java similarity index 90% rename from L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java rename to L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 6745b1d5e4..76176d2ab3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java similarity index 90% rename from L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java rename to L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java index fe698d8e2a..1099b77054 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 93% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index f543c70ebd..ea29d773db 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.stats.Stat; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java similarity index 90% rename from L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java rename to L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java index 12b33e468f..308f08c38b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 0028a98c4c..5b8d1089b7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -75,15 +75,15 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java similarity index 94% rename from L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java rename to L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java index b9c20b90ae..7fef025a56 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Crystal Type enumerated. diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 93% rename from L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index 5730665d9f..c9c153923e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * EtcItem Type enumerated. diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 303968e17b..be37b10d4f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 16179e31af..1d65777bcf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -54,14 +54,14 @@ import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 55f36d4476..f6b56b0190 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Henna.java deleted file mode 100644 index 426a12682a..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Henna.java +++ /dev/null @@ -1,183 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; - -import org.l2jmobius.gameserver.enums.ClassId; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; - -/** - * Class for the Henna object. - * @author Zoey76 - */ -public class Henna -{ - private final int _dyeId; - private final int _dyeItemId; - private final boolean _isPremium; - private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wearFee; - private final int _wearCount; - private final int _cancelFee; - private final int _cancelCount; - private final int _duration; - private final List _skills; - private final List _wearClass; - - public Henna(StatSet set) - { - _dyeId = set.getInt("dyeId"); - _dyeItemId = set.getInt("dyeItemId"); - _isPremium = set.getBoolean("isPremium", false); - _baseStats.put(BaseStat.STR, set.getInt("str", 0)); - _baseStats.put(BaseStat.CON, set.getInt("con", 0)); - _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); - _baseStats.put(BaseStat.INT, set.getInt("int", 0)); - _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); - _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); - _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wearFee = set.getInt("wear_fee"); - _wearCount = set.getInt("wear_count"); - _cancelFee = set.getInt("cancel_fee"); - _cancelCount = set.getInt("cancel_count"); - _duration = set.getInt("duration", -1); - _skills = new ArrayList<>(); - _wearClass = new ArrayList<>(); - } - - /** - * @return the dye Id. - */ - public int getDyeId() - { - return _dyeId; - } - - /** - * @return the item Id, required for this dye. - */ - public int getDyeItemId() - { - return _dyeItemId; - } - - /** - * @return true if this dye is premium. - */ - public boolean isPremium() - { - return _isPremium; - } - - public int getBaseStats(BaseStat stat) - { - return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); - } - - public Map getBaseStats() - { - return _baseStats; - } - - /** - * @return the wear fee, cost for adding this dye to the player. - */ - public int getWearFee() - { - return _wearFee; - } - - /** - * @return the wear count, the required count to add this dye to the player. - */ - public int getWearCount() - { - return _wearCount; - } - - /** - * @return the cancel fee, cost for removing this dye from the player. - */ - public int getCancelFee() - { - return _cancelFee; - } - - /** - * @return the cancel count, the retrieved amount of dye items after removing the dye. - */ - public int getCancelCount() - { - return _cancelCount; - } - - /** - * @return the duration of this dye. - */ - public int getDuration() - { - return _duration; - } - - /** - * @param skillList the list of skills related to this dye. - */ - public void setSkills(List skillList) - { - _skills.addAll(skillList); - } - - /** - * @return the skills related to this dye. - */ - public List getSkills() - { - return _skills; - } - - /** - * @return the list with the allowed classes to wear this dye. - */ - public List getAllowedWearClass() - { - return _wearClass; - } - - /** - * @param classId the class trying to wear this dye. - * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. - */ - public boolean isAllowedClass(ClassId classId) - { - return _wearClass.contains(classId); - } - - /** - * @param wearClassIds the list of classes that can wear this dye. - */ - public void setWearClassIds(List wearClassIds) - { - _wearClass.addAll(wearClassIds); - } -} \ No newline at end of file diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Weapon.java deleted file mode 100644 index 85bb22d23b..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is dedicated to the management of weapons. - */ -public class Weapon extends ItemTemplate -{ - private WeaponType _type; - private boolean _isMagicWeapon; - private int _soulShotCount; - private int _spiritShotCount; - private int _mpConsume; - private int _baseAttackRange; - private int _baseAttackRadius; - private int _baseAttackAngle; - private int _changeWeaponId; - - private int _reducedSoulshot; - private int _reducedSoulshotChance; - - private int _reducedMpConsume; - private int _reducedMpConsumeChance; - - private boolean _isForceEquip; - private boolean _isAttackWeapon; - private boolean _useWeaponSkillsOnly; - - /** - * Constructor for Weapon. - * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. - */ - public Weapon(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_WEAPON; - _isMagicWeapon = set.getBoolean("is_magic_weapon", false); - _soulShotCount = set.getInt("soulshots", 0); - _spiritShotCount = set.getInt("spiritshots", 0); - _mpConsume = set.getInt("mp_consume", 0); - _baseAttackRange = set.getInt("attack_range", 40); - final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) - { - _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); - } - else - { - _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 - } - - final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); - _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; - _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; - - final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); - _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; - _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; - _changeWeaponId = set.getInt("change_weaponId", 0); - _isForceEquip = set.getBoolean("isForceEquip", false); - _isAttackWeapon = set.getBoolean("isAttackWeapon", true); - _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); - } - - /** - * @return the type of Weapon - */ - @Override - public WeaponType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - @Override - public boolean isWeapon() - { - return true; - } - - /** - * @return {@code true} if the weapon is magic, {@code false} otherwise. - */ - @Override - public boolean isMagicWeapon() - { - return _isMagicWeapon; - } - - /** - * @return the quantity of SoulShot used. - */ - public int getSoulShotCount() - { - return _soulShotCount; - } - - /** - * @return the quantity of SpiritShot used. - */ - public int getSpiritShotCount() - { - return _spiritShotCount; - } - - /** - * @return the reduced quantity of SoultShot used. - */ - public int getReducedSoulShot() - { - return _reducedSoulshot; - } - - /** - * @return the chance to use Reduced SoultShot. - */ - public int getReducedSoulShotChance() - { - return _reducedSoulshotChance; - } - - /** - * @return the MP consumption with the weapon. - */ - public int getMpConsume() - { - return _mpConsume; - } - - public int getBaseAttackRange() - { - return _baseAttackRange; - } - - public int getBaseAttackRadius() - { - return _baseAttackRadius; - } - - public int getBaseAttackAngle() - { - return _baseAttackAngle; - } - - /** - * @return the reduced MP consumption with the weapon. - */ - public int getReducedMpConsume() - { - return _reducedMpConsume; - } - - /** - * @return the chance to use getReducedMpConsume() - */ - public int getReducedMpConsumeChance() - { - return _reducedMpConsumeChance; - } - - /** - * @return the Id in which weapon this weapon can be changed. - */ - public int getChangeWeaponId() - { - return _changeWeaponId; - } - - /** - * @return {@code true} if the weapon is force equip, {@code false} otherwise. - */ - public boolean isForceEquip() - { - return _isForceEquip; - } - - /** - * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. - */ - public boolean isAttackWeapon() - { - return _isAttackWeapon; - } - - /** - * @return {@code true} if the weapon is skills only, {@code false} otherwise. - */ - public boolean useWeaponSkillsOnly() - { - return _useWeaponSkillsOnly; - } - - /** - * @param caster the Creature pointing out the caster - * @param target the Creature pointing out the target - * @param trigger - * @param type - */ - public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) - { - forEachSkill(type, holder -> - { - final Skill skill = holder.getSkill(); - if (Rnd.get(100) >= holder.getChance()) - { - return; - } - - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // Trigger only if both are good or bad magic. - if (trigger.isBad() != skill.isBad()) - { - return; - } - - // No Trigger if not Magic Skill or is toggle - if (trigger.isMagic() != skill.isMagic()) - { - return; - } - - // No Trigger if skill is toggle - if (trigger.isToggle()) - { - return; - } - - if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) - { - return; - } - } - - // Skill condition not met - if (!skill.checkCondition(caster, target)) - { - return; - } - - skill.activateSkill(caster, target); - - // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // notify quests of a skill use - if (caster.isPlayer()) - { - World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); - } - if (caster.isPlayer()) - { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); - sm.addSkillName(skill); - caster.sendPacket(sm); - } - } - }); - } -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java deleted file mode 100644 index a2897ba911..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import java.util.EnumMap; -import java.util.Map; - -import org.l2jmobius.gameserver.model.StatSet; - -/** - * @author UnAfraid - */ -public class CombinationItem -{ - private final int _itemOne; - private final int _itemTwo; - private final int _chance; - private final Map _rewards = new EnumMap<>(CombinationItemType.class); - - public CombinationItem(StatSet set) - { - _itemOne = set.getInt("one"); - _itemTwo = set.getInt("two"); - _chance = set.getInt("chance"); - } - - public int getItemOne() - { - return _itemOne; - } - - public int getItemTwo() - { - return _itemTwo; - } - - public int getChance() - { - return _chance; - } - - public void addReward(CombinationItemReward item) - { - _rewards.put(item.getType(), item); - } - - public CombinationItemReward getReward(CombinationItemType type) - { - return _rewards.get(type); - } -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 36ec6f7eea..7949396130 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index c465f8d4ea..6a10ea1945 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java index f349bdb5e9..2c0e8e2dbb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -65,8 +65,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java index 80eec709d8..1e18bcb9ad 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index e66e52c0e8..35b85934ab 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java index ab75417b52..6e65b03682 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index da2c567d17..a99ddb2dfe 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 402c603dac..645156f9c1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ee53743fce..31df739b0f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index c37fedbfb8..068f5c9368 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index ef63d53ef4..0546560e58 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 3eda159a36..c524cb94f1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index ddbf6666c9..c4b2ee6602 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index 45301710ad..e9fb2b0c78 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index de0c583a95..59a7a0e0bb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index cfb6455ad0..31d29ef3dd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 0b790bd1c8..6b63144276 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -42,8 +42,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index a9a1f2b819..7603378b34 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -53,8 +53,8 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index bdcaa09947..b6effdbcb9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index f4872a36bb..b7a2c5c6c4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index d6df3726cc..47214311ac 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 0d59d2ff65..e8d7efa6b0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 9054640b60..2f12cc278e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 2ca0f283f9..4f351a636b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 6cc03e2c2b..48cdb8e80b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 4059676af0..400aacd446 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f6e37e1f1e..efe35c4745 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 6b1a6a94e8..1b20e2e248 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 29f7828f27..a9fd8d923a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 12bc7c708d..79e1193ac0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index a438e21228..eab1e325f5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 469ee06f48..70e2f43664 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 1ce073af11..14f42293bf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 1ee323a63c..7da966ce9f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 989d2e582f..2c715b4efb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d7fcffbdb5..4468b67642 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 35f568fc0b..0ab9577343 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 9f321c1803..7ca2a01f2e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index a9ef6cad0a..db2856317d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index de4094b252..db5981de3d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 627279d57e..15e138aa4f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 61920f471b..f89be1cfcb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index ff361e97a4..1840fcded7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 17fa6aeaf2..f02aaa9ace 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index dd77da842f..ca18e8faba 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 251b8c7719..964fffd4a3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 6800a418cc..d257cb06cc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AlchemyResult; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index f144094dda..95a85c269b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index e7a8e8baf6..7fbd7ebecb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 56cf3b84cc..b9a7aadbf7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index e8f3c75825..912dae684a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index 628878dda6..76e42799c4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51cd76618e..af8b12547e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 38bda2e6fb..e9cd6a88b8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 3ec3d494e8..db168592f1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 93588924fe..077f33cb49 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 07725028a6..76375a86f7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c5c1d1141..81a384642c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index e4fb9e4160..b65005003d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 51abfa9d3e..f49138fafe 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 809a864983..395487097c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 2fe9967302..30dc837721 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 6691a8ea4f..cf3d83263f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 97b7b53cae..cb1379ac29 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index f826c75d4b..844fad86c7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index bd768c74e2..c4598a72e6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index a5616075a6..e1da19cc8f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ced39204d3..fbb5c84dfe 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4068629bde..d05590cbde 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index c49a1d369f..4d605cfbb4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index d48b66c6ef..9d9b24a54f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c742d534c4..c59568bf1d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index a22b36335e..35ca986d35 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 271ec4401b..37150ec357 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 6b8cd1358f..c32d4f7c04 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/DocumentBase.java index 65e18e4a0e..bcbe96ad19 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -134,9 +137,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 8872179ed8..c6d295746c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 450d7a1ed6..3d13e43577 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java index 299274160b..e1f6de3c80 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExGetPremiumItemList; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DragonWeaponListeners.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DragonWeaponListeners.java index 09171d6d97..c50af03d70 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DragonWeaponListeners.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/DragonWeaponListeners.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemEquip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/SiegeGuards.java index 07d6a45613..ea67a6b16c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 69349fc9ef..5f7c45d595 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionCancel; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 418ed93b2a..4081019df2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index a53c69fb80..680745b29d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 5b1db54836..e7113941ec 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index f73f3c2e73..5d3caadfd5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 0a82f9968d..35d31315ad 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 59e5b148a1..76d08b7a2b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index dd5c2f593d..2ea2bf9f11 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index f7054e99e9..17d76b1bf6 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d5d2ad10cf..8f4db5d580 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 0ae4fd3481..d7c59f6780 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 791bec47b7..39f4aa7422 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index ab33e22a5f..adc092f771 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 31621251be..62d5debb32 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index a2dc3f75fd..1bd311ede1 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index fae553ff45..991d2217b5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 7d0f0b43ba..9723633d69 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 437b502a95..b8985f0fef 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 16e5d6ee8e..eabd0e3d70 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java index 2e2e322e86..6183d5637e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index bfc65e27f5..879983272a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index d592bba597..96b98f6548 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index aa2eabd231..5690696b29 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 705ed225aa..a74d84251f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index a5cdbefa8b..f534a5ca55 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java index d480511447..c69477f113 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index ecebff8fcf..bbe94f05d2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d55c2897df..a58e246a0d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java index 06f3fb2e45..4e0e25e56f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 8f81770a04..53f0529429 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index af19b2276d..ded8b9bcbc 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 7e60c89db5..2ca2c2fc70 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 6a58fbf31b..f4ff6be84c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java index e4245a37c1..f05c5a48b9 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java index 30b8b4d117..b5739976ad 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6f313482ab..54230f39a1 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b485046a39..25c237e53f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 410e71cff8..01714d7f5a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java index 0767b28991..6c95915b62 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index c6528207ac..a0b53bbc44 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 90b5312e92..b860d16e2f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 2472a2d955..85d614b478 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index d1d5c8c332..c2610ec4e3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 6a740915da..f137988e26 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 91b4783b6f..465c7876f3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 5653ea4612..4cf7f101e9 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java index ef282584ac..03e791c09f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 4db0961a07..416fa8a65a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27f0904f0f..a61cc1bd71 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 255f805e72..12f575b243 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index ff9e654e61..3aeadd38a7 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 77b9a03185..c0d47bc8de 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java index 2ad8e45099..3f580995d2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 252f6cdb3e..40fb48b033 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java index b9d21a55ae..40e84f4dd0 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java @@ -19,7 +19,7 @@ package quests.Q00756_TopQualityPetra; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java index 948d7b6127..b5fee1d434 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java index 90a68d79e3..075ada8600 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java @@ -18,7 +18,7 @@ package quests.Q10303_CrossroadsBetweenLightAndDarkness; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java index 880cbddbb1..8f6fbc81e8 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java index a31abfa83b..b9a18ed239 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java index faa49497bf..3dd42f74db 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/ItemTable.java index 9182d52fcc..94b4547625 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index d508b71aef..fd2a491d66 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 0f8815bcc4..475f0085d8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index a213d965da..cab4dfa0e9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java index 426e9dd06f..6c261d6ded 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 4793281033..18a8c90960 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index 1b5d73308d..4ed0600683 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 0f7be781b2..7bc7be8487 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index efa12b90bc..662dbf7c39 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 3d21c7ddf0..5f3eb28e8a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ArmorSet.java index 2a57f20a10..6b504526ef 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CombatFlag.java index 42a0ed06cb..faaeb77d79 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 739c5adb76..ba6a645d4d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java index 5b309bb46b..0936598410 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Seed.java index 13caeeb575..2dc7f967bb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java index a9796fbbb7..36f3461010 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeList.java index bbafcb1416..bea714862c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 444300d459..112976ec82 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -63,8 +63,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java index 4f2c1f0058..c52e6f0125 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java index 757412e9b3..ffae01611d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java index e481baaa96..99f2c922dd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -228,23 +228,23 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java index 1d10d176ce..3d1b9ef6c2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 2dd9a62da6..ed26029abd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b3fac75f08..8f7214b2d0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index bff7d7d596..678412218a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; public class PlayableStat extends CreatureStat diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 734517aa45..5e02dfdfa6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index da03c6b165..d93e4def4d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 6edc19b444..a62d59b876 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9c053efc5e..ebe8b7499f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 5b4ab6daf1..d68a40ee75 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 85c89d15ec..4c9bc6856c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 68990650dd..c08b648e55 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index a5fea7c6f6..347f281026 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 2f1424657f..b5b9ac8025 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -132,15 +132,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java index f65fcabe54..e0317b1c0a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java index 780dbd83e4..51ec6c9e3d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java index 81e8c9eb16..bf1d1237f1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index af538045b8..d391a4faf1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 79c69f739d..41f554b9e0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index b86121305d..b18ff0fce9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java index d01b97cc2c..fcd3b7c0ba 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.model.TradeItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Armor.java index a2f1c2d3e6..c2d573ea62 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Henna.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Henna.java new file mode 100644 index 0000000000..0d1de91388 --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -0,0 +1,183 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; + +/** + * Class for the Henna object. + * @author Zoey76 + */ +public class Henna +{ + private final int _dyeId; + private final int _dyeItemId; + private final boolean _isPremium; + private final Map _baseStats = new EnumMap<>(BaseStat.class); + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final int _duration; + private final List _skills; + private final List _wearClass; + + public Henna(StatSet set) + { + _dyeId = set.getInt("dyeId"); + _dyeItemId = set.getInt("dyeItemId"); + _isPremium = set.getBoolean("isPremium", false); + _baseStats.put(BaseStat.STR, set.getInt("str", 0)); + _baseStats.put(BaseStat.CON, set.getInt("con", 0)); + _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); + _baseStats.put(BaseStat.INT, set.getInt("int", 0)); + _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); + _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); + _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); + _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _duration = set.getInt("duration", -1); + _skills = new ArrayList<>(); + _wearClass = new ArrayList<>(); + } + + /** + * @return the dye Id. + */ + public int getDyeId() + { + return _dyeId; + } + + /** + * @return the item Id, required for this dye. + */ + public int getDyeItemId() + { + return _dyeItemId; + } + + /** + * @return true if this dye is premium. + */ + public boolean isPremium() + { + return _isPremium; + } + + public int getBaseStats(BaseStat stat) + { + return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); + } + + public Map getBaseStats() + { + return _baseStats; + } + + /** + * @return the wear fee, cost for adding this dye to the player. + */ + public int getWearFee() + { + return _wearFee; + } + + /** + * @return the wear count, the required count to add this dye to the player. + */ + public int getWearCount() + { + return _wearCount; + } + + /** + * @return the cancel fee, cost for removing this dye from the player. + */ + public int getCancelFee() + { + return _cancelFee; + } + + /** + * @return the cancel count, the retrieved amount of dye items after removing the dye. + */ + public int getCancelCount() + { + return _cancelCount; + } + + /** + * @return the duration of this dye. + */ + public int getDuration() + { + return _duration; + } + + /** + * @param skillList the list of skills related to this dye. + */ + public void setSkills(List skillList) + { + _skills.addAll(skillList); + } + + /** + * @return the skills related to this dye. + */ + public List getSkills() + { + return _skills; + } + + /** + * @return the list with the allowed classes to wear this dye. + */ + public List getAllowedWearClass() + { + return _wearClass; + } + + /** + * @param classId the class trying to wear this dye. + * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. + */ + public boolean isAllowedClass(ClassId classId) + { + return _wearClass.contains(classId); + } + + /** + * @param wearClassIds the list of classes that can wear this dye. + */ + public void setWearClassIds(List wearClassIds) + { + _wearClass.addAll(wearClassIds); + } +} \ No newline at end of file diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index 544e7bb748..d6d1501119 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 91% rename from L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index 5618132356..b289fa70ae 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.Collection; import java.util.Objects; @@ -22,9 +22,9 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Weapon.java new file mode 100644 index 0000000000..3ae599da0d --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -0,0 +1,311 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.enums.ItemSkillType; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is dedicated to the management of weapons. + */ +public class Weapon extends ItemTemplate +{ + private WeaponType _type; + private boolean _isMagicWeapon; + private int _soulShotCount; + private int _spiritShotCount; + private int _mpConsume; + private int _baseAttackRange; + private int _baseAttackRadius; + private int _baseAttackAngle; + private int _changeWeaponId; + + private int _reducedSoulshot; + private int _reducedSoulshotChance; + + private int _reducedMpConsume; + private int _reducedMpConsumeChance; + + private boolean _isForceEquip; + private boolean _isAttackWeapon; + private boolean _useWeaponSkillsOnly; + + /** + * Constructor for Weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. + */ + public Weapon(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_WEAPON; + _isMagicWeapon = set.getBoolean("is_magic_weapon", false); + _soulShotCount = set.getInt("soulshots", 0); + _spiritShotCount = set.getInt("spiritshots", 0); + _mpConsume = set.getInt("mp_consume", 0); + _baseAttackRange = set.getInt("attack_range", 40); + final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) + { + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + } + else + { + _baseAttackRadius = 40; + _baseAttackAngle = 240; // 360 - 120 + } + + final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); + _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; + _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; + + final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); + _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; + _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; + _changeWeaponId = set.getInt("change_weaponId", 0); + _isForceEquip = set.getBoolean("isForceEquip", false); + _isAttackWeapon = set.getBoolean("isAttackWeapon", true); + _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); + } + + /** + * @return the type of Weapon + */ + @Override + public WeaponType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + @Override + public boolean isWeapon() + { + return true; + } + + /** + * @return {@code true} if the weapon is magic, {@code false} otherwise. + */ + @Override + public boolean isMagicWeapon() + { + return _isMagicWeapon; + } + + /** + * @return the quantity of SoulShot used. + */ + public int getSoulShotCount() + { + return _soulShotCount; + } + + /** + * @return the quantity of SpiritShot used. + */ + public int getSpiritShotCount() + { + return _spiritShotCount; + } + + /** + * @return the reduced quantity of SoultShot used. + */ + public int getReducedSoulShot() + { + return _reducedSoulshot; + } + + /** + * @return the chance to use Reduced SoultShot. + */ + public int getReducedSoulShotChance() + { + return _reducedSoulshotChance; + } + + /** + * @return the MP consumption with the weapon. + */ + public int getMpConsume() + { + return _mpConsume; + } + + public int getBaseAttackRange() + { + return _baseAttackRange; + } + + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + + /** + * @return the reduced MP consumption with the weapon. + */ + public int getReducedMpConsume() + { + return _reducedMpConsume; + } + + /** + * @return the chance to use getReducedMpConsume() + */ + public int getReducedMpConsumeChance() + { + return _reducedMpConsumeChance; + } + + /** + * @return the Id in which weapon this weapon can be changed. + */ + public int getChangeWeaponId() + { + return _changeWeaponId; + } + + /** + * @return {@code true} if the weapon is force equip, {@code false} otherwise. + */ + public boolean isForceEquip() + { + return _isForceEquip; + } + + /** + * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. + */ + public boolean isAttackWeapon() + { + return _isAttackWeapon; + } + + /** + * @return {@code true} if the weapon is skills only, {@code false} otherwise. + */ + public boolean useWeaponSkillsOnly() + { + return _useWeaponSkillsOnly; + } + + /** + * @param caster the Creature pointing out the caster + * @param target the Creature pointing out the target + * @param trigger + * @param type + */ + public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) + { + forEachSkill(type, holder -> + { + final Skill skill = holder.getSkill(); + if (Rnd.get(100) >= holder.getChance()) + { + return; + } + + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // Trigger only if both are good or bad magic. + if (trigger.isBad() != skill.isBad()) + { + return; + } + + // No Trigger if not Magic Skill or is toggle + if (trigger.isMagic() != skill.isMagic()) + { + return; + } + + // No Trigger if skill is toggle + if (trigger.isToggle()) + { + return; + } + + if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) + { + return; + } + } + + // Skill condition not met + if (!skill.checkCondition(caster, target)) + { + return; + } + + skill.activateSkill(caster, target); + + // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // notify quests of a skill use + if (caster.isPlayer()) + { + World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); + } + if (caster.isPlayer()) + { + final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); + sm.addSkillName(skill); + caster.sendPacket(sm); + } + } + }); + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java similarity index 93% rename from L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java rename to L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index a568389489..610e720125 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; import java.time.Duration; import java.util.ArrayList; @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java new file mode 100644 index 0000000000..6f73983c0e --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -0,0 +1,65 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import java.util.EnumMap; +import java.util.Map; + +import org.l2jmobius.gameserver.model.StatSet; + +/** + * @author UnAfraid + */ +public class CombinationItem +{ + private final int _itemOne; + private final int _itemTwo; + private final int _chance; + private final Map _rewards = new EnumMap<>(CombinationItemType.class); + + public CombinationItem(StatSet set) + { + _itemOne = set.getInt("one"); + _itemTwo = set.getInt("two"); + _chance = set.getInt("chance"); + } + + public int getItemOne() + { + return _itemOne; + } + + public int getItemTwo() + { + return _itemTwo; + } + + public int getChance() + { + return _chance; + } + + public void addReward(CombinationItemReward item) + { + _rewards.put(item.getType(), item); + } + + public CombinationItemReward getReward(CombinationItemType type) + { + return _rewards.get(type); + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java similarity index 90% rename from L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java rename to L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 6745b1d5e4..76176d2ab3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java similarity index 90% rename from L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java rename to L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java index fe698d8e2a..1099b77054 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 93% rename from L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index f543c70ebd..ea29d773db 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.stats.Stat; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java similarity index 90% rename from L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java rename to L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java index 12b33e468f..308f08c38b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 0028a98c4c..5b8d1089b7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -75,15 +75,15 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java similarity index 94% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java rename to L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java index b9c20b90ae..7fef025a56 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Crystal Type enumerated. diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 93% rename from L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index 5730665d9f..c9c153923e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * EtcItem Type enumerated. diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 8323d4bdc7..06760564d7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 1d64999966..6eb95527e0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -54,14 +54,14 @@ import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 55f36d4476..f6b56b0190 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Henna.java deleted file mode 100644 index 426a12682a..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Henna.java +++ /dev/null @@ -1,183 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; - -import org.l2jmobius.gameserver.enums.ClassId; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; - -/** - * Class for the Henna object. - * @author Zoey76 - */ -public class Henna -{ - private final int _dyeId; - private final int _dyeItemId; - private final boolean _isPremium; - private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wearFee; - private final int _wearCount; - private final int _cancelFee; - private final int _cancelCount; - private final int _duration; - private final List _skills; - private final List _wearClass; - - public Henna(StatSet set) - { - _dyeId = set.getInt("dyeId"); - _dyeItemId = set.getInt("dyeItemId"); - _isPremium = set.getBoolean("isPremium", false); - _baseStats.put(BaseStat.STR, set.getInt("str", 0)); - _baseStats.put(BaseStat.CON, set.getInt("con", 0)); - _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); - _baseStats.put(BaseStat.INT, set.getInt("int", 0)); - _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); - _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); - _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wearFee = set.getInt("wear_fee"); - _wearCount = set.getInt("wear_count"); - _cancelFee = set.getInt("cancel_fee"); - _cancelCount = set.getInt("cancel_count"); - _duration = set.getInt("duration", -1); - _skills = new ArrayList<>(); - _wearClass = new ArrayList<>(); - } - - /** - * @return the dye Id. - */ - public int getDyeId() - { - return _dyeId; - } - - /** - * @return the item Id, required for this dye. - */ - public int getDyeItemId() - { - return _dyeItemId; - } - - /** - * @return true if this dye is premium. - */ - public boolean isPremium() - { - return _isPremium; - } - - public int getBaseStats(BaseStat stat) - { - return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); - } - - public Map getBaseStats() - { - return _baseStats; - } - - /** - * @return the wear fee, cost for adding this dye to the player. - */ - public int getWearFee() - { - return _wearFee; - } - - /** - * @return the wear count, the required count to add this dye to the player. - */ - public int getWearCount() - { - return _wearCount; - } - - /** - * @return the cancel fee, cost for removing this dye from the player. - */ - public int getCancelFee() - { - return _cancelFee; - } - - /** - * @return the cancel count, the retrieved amount of dye items after removing the dye. - */ - public int getCancelCount() - { - return _cancelCount; - } - - /** - * @return the duration of this dye. - */ - public int getDuration() - { - return _duration; - } - - /** - * @param skillList the list of skills related to this dye. - */ - public void setSkills(List skillList) - { - _skills.addAll(skillList); - } - - /** - * @return the skills related to this dye. - */ - public List getSkills() - { - return _skills; - } - - /** - * @return the list with the allowed classes to wear this dye. - */ - public List getAllowedWearClass() - { - return _wearClass; - } - - /** - * @param classId the class trying to wear this dye. - * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. - */ - public boolean isAllowedClass(ClassId classId) - { - return _wearClass.contains(classId); - } - - /** - * @param wearClassIds the list of classes that can wear this dye. - */ - public void setWearClassIds(List wearClassIds) - { - _wearClass.addAll(wearClassIds); - } -} \ No newline at end of file diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Weapon.java deleted file mode 100644 index 85bb22d23b..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is dedicated to the management of weapons. - */ -public class Weapon extends ItemTemplate -{ - private WeaponType _type; - private boolean _isMagicWeapon; - private int _soulShotCount; - private int _spiritShotCount; - private int _mpConsume; - private int _baseAttackRange; - private int _baseAttackRadius; - private int _baseAttackAngle; - private int _changeWeaponId; - - private int _reducedSoulshot; - private int _reducedSoulshotChance; - - private int _reducedMpConsume; - private int _reducedMpConsumeChance; - - private boolean _isForceEquip; - private boolean _isAttackWeapon; - private boolean _useWeaponSkillsOnly; - - /** - * Constructor for Weapon. - * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. - */ - public Weapon(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_WEAPON; - _isMagicWeapon = set.getBoolean("is_magic_weapon", false); - _soulShotCount = set.getInt("soulshots", 0); - _spiritShotCount = set.getInt("spiritshots", 0); - _mpConsume = set.getInt("mp_consume", 0); - _baseAttackRange = set.getInt("attack_range", 40); - final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) - { - _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); - } - else - { - _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 - } - - final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); - _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; - _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; - - final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); - _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; - _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; - _changeWeaponId = set.getInt("change_weaponId", 0); - _isForceEquip = set.getBoolean("isForceEquip", false); - _isAttackWeapon = set.getBoolean("isAttackWeapon", true); - _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); - } - - /** - * @return the type of Weapon - */ - @Override - public WeaponType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - @Override - public boolean isWeapon() - { - return true; - } - - /** - * @return {@code true} if the weapon is magic, {@code false} otherwise. - */ - @Override - public boolean isMagicWeapon() - { - return _isMagicWeapon; - } - - /** - * @return the quantity of SoulShot used. - */ - public int getSoulShotCount() - { - return _soulShotCount; - } - - /** - * @return the quantity of SpiritShot used. - */ - public int getSpiritShotCount() - { - return _spiritShotCount; - } - - /** - * @return the reduced quantity of SoultShot used. - */ - public int getReducedSoulShot() - { - return _reducedSoulshot; - } - - /** - * @return the chance to use Reduced SoultShot. - */ - public int getReducedSoulShotChance() - { - return _reducedSoulshotChance; - } - - /** - * @return the MP consumption with the weapon. - */ - public int getMpConsume() - { - return _mpConsume; - } - - public int getBaseAttackRange() - { - return _baseAttackRange; - } - - public int getBaseAttackRadius() - { - return _baseAttackRadius; - } - - public int getBaseAttackAngle() - { - return _baseAttackAngle; - } - - /** - * @return the reduced MP consumption with the weapon. - */ - public int getReducedMpConsume() - { - return _reducedMpConsume; - } - - /** - * @return the chance to use getReducedMpConsume() - */ - public int getReducedMpConsumeChance() - { - return _reducedMpConsumeChance; - } - - /** - * @return the Id in which weapon this weapon can be changed. - */ - public int getChangeWeaponId() - { - return _changeWeaponId; - } - - /** - * @return {@code true} if the weapon is force equip, {@code false} otherwise. - */ - public boolean isForceEquip() - { - return _isForceEquip; - } - - /** - * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. - */ - public boolean isAttackWeapon() - { - return _isAttackWeapon; - } - - /** - * @return {@code true} if the weapon is skills only, {@code false} otherwise. - */ - public boolean useWeaponSkillsOnly() - { - return _useWeaponSkillsOnly; - } - - /** - * @param caster the Creature pointing out the caster - * @param target the Creature pointing out the target - * @param trigger - * @param type - */ - public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) - { - forEachSkill(type, holder -> - { - final Skill skill = holder.getSkill(); - if (Rnd.get(100) >= holder.getChance()) - { - return; - } - - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // Trigger only if both are good or bad magic. - if (trigger.isBad() != skill.isBad()) - { - return; - } - - // No Trigger if not Magic Skill or is toggle - if (trigger.isMagic() != skill.isMagic()) - { - return; - } - - // No Trigger if skill is toggle - if (trigger.isToggle()) - { - return; - } - - if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) - { - return; - } - } - - // Skill condition not met - if (!skill.checkCondition(caster, target)) - { - return; - } - - skill.activateSkill(caster, target); - - // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // notify quests of a skill use - if (caster.isPlayer()) - { - World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); - } - if (caster.isPlayer()) - { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); - sm.addSkillName(skill); - caster.sendPacket(sm); - } - } - }); - } -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java deleted file mode 100644 index a2897ba911..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import java.util.EnumMap; -import java.util.Map; - -import org.l2jmobius.gameserver.model.StatSet; - -/** - * @author UnAfraid - */ -public class CombinationItem -{ - private final int _itemOne; - private final int _itemTwo; - private final int _chance; - private final Map _rewards = new EnumMap<>(CombinationItemType.class); - - public CombinationItem(StatSet set) - { - _itemOne = set.getInt("one"); - _itemTwo = set.getInt("two"); - _chance = set.getInt("chance"); - } - - public int getItemOne() - { - return _itemOne; - } - - public int getItemTwo() - { - return _itemTwo; - } - - public int getChance() - { - return _chance; - } - - public void addReward(CombinationItemReward item) - { - _rewards.put(item.getType(), item); - } - - public CombinationItemReward getReward(CombinationItemType type) - { - return _rewards.get(type); - } -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 36ec6f7eea..7949396130 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 4cfb17a0ba..b9991074a2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java index 5f3d83eb7d..bdf8218191 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -65,8 +65,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java index 80eec709d8..1e18bcb9ad 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index e66e52c0e8..35b85934ab 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java index ab75417b52..6e65b03682 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index da2c567d17..a99ddb2dfe 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 402c603dac..645156f9c1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ee53743fce..31df739b0f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index c37fedbfb8..068f5c9368 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index ef63d53ef4..0546560e58 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 3eda159a36..c524cb94f1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index ddbf6666c9..c4b2ee6602 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index 45301710ad..e9fb2b0c78 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index de0c583a95..59a7a0e0bb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index cfb6455ad0..31d29ef3dd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 0b790bd1c8..6b63144276 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -42,8 +42,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 5b929aae30..0d9037eb49 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -53,8 +53,8 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index bdcaa09947..b6effdbcb9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index f4872a36bb..b7a2c5c6c4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index d6df3726cc..47214311ac 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 0d59d2ff65..e8d7efa6b0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 9054640b60..2f12cc278e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 2ca0f283f9..4f351a636b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 6cc03e2c2b..48cdb8e80b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 4059676af0..400aacd446 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index f6e37e1f1e..efe35c4745 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 6b1a6a94e8..1b20e2e248 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java index 9e7b0f444e..de4256e2fa 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java @@ -22,8 +22,8 @@ import java.util.Set; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExTryEnchantArtifactResult; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 29f7828f27..a9fd8d923a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 12bc7c708d..79e1193ac0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index a438e21228..eab1e325f5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 469ee06f48..70e2f43664 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 1dca606dcd..36256ab955 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 1ee323a63c..7da966ce9f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 989d2e582f..2c715b4efb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d7fcffbdb5..4468b67642 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 35f568fc0b..0ab9577343 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 9f321c1803..7ca2a01f2e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index ce66388a02..ecb0ab9738 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index de4094b252..db5981de3d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 9bddf5f507..19a6780f98 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 61920f471b..f89be1cfcb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index ff361e97a4..1840fcded7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 17fa6aeaf2..f02aaa9ace 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index ca043af307..74f5736cf7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 251b8c7719..964fffd4a3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 6800a418cc..d257cb06cc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AlchemyResult; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index f144094dda..95a85c269b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index e7a8e8baf6..7fbd7ebecb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 56cf3b84cc..b9a7aadbf7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index e8f3c75825..912dae684a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index 628878dda6..76e42799c4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51cd76618e..af8b12547e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 38bda2e6fb..e9cd6a88b8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 3ec3d494e8..db168592f1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 93588924fe..077f33cb49 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 07725028a6..76375a86f7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c5c1d1141..81a384642c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index e4fb9e4160..b65005003d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 51abfa9d3e..f49138fafe 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 809a864983..395487097c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 2fe9967302..30dc837721 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 6691a8ea4f..cf3d83263f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 97b7b53cae..cb1379ac29 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index f826c75d4b..844fad86c7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index bd768c74e2..c4598a72e6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index a5616075a6..e1da19cc8f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ced39204d3..fbb5c84dfe 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4068629bde..d05590cbde 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index c49a1d369f..4d605cfbb4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index d48b66c6ef..9d9b24a54f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c742d534c4..c59568bf1d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index a22b36335e..35ca986d35 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 271ec4401b..37150ec357 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 6b8cd1358f..c32d4f7c04 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/DocumentBase.java index 65e18e4a0e..bcbe96ad19 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -134,9 +137,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 8872179ed8..c6d295746c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index 450d7a1ed6..3d13e43577 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java index 299274160b..e1f6de3c80 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExGetPremiumItemList; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DragonWeaponListeners.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DragonWeaponListeners.java index 09171d6d97..c50af03d70 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DragonWeaponListeners.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/DragonWeaponListeners.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemEquip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/SiegeGuards.java index 07d6a45613..ea67a6b16c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 69349fc9ef..5f7c45d595 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionCancel; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 418ed93b2a..4081019df2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index a53c69fb80..680745b29d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 5b1db54836..e7113941ec 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index f73f3c2e73..5d3caadfd5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 0a82f9968d..35d31315ad 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 59e5b148a1..76d08b7a2b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index dd5c2f593d..2ea2bf9f11 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index f7054e99e9..17d76b1bf6 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d5d2ad10cf..8f4db5d580 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 0ae4fd3481..d7c59f6780 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 791bec47b7..39f4aa7422 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index ab33e22a5f..adc092f771 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 31621251be..62d5debb32 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index a2dc3f75fd..1bd311ede1 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index fae553ff45..991d2217b5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 7d0f0b43ba..9723633d69 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 437b502a95..b8985f0fef 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 16e5d6ee8e..eabd0e3d70 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java index 2e2e322e86..6183d5637e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index bfc65e27f5..879983272a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index d592bba597..96b98f6548 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index aa2eabd231..5690696b29 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 705ed225aa..a74d84251f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index a5cdbefa8b..f534a5ca55 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java index d480511447..c69477f113 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index ecebff8fcf..bbe94f05d2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d55c2897df..a58e246a0d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java index 06f3fb2e45..4e0e25e56f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 8f81770a04..53f0529429 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index af19b2276d..ded8b9bcbc 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 7e60c89db5..2ca2c2fc70 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 6a58fbf31b..f4ff6be84c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java index e4245a37c1..f05c5a48b9 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java index 30b8b4d117..b5739976ad 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6f313482ab..54230f39a1 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b485046a39..25c237e53f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 410e71cff8..01714d7f5a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java index 0767b28991..6c95915b62 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index c6528207ac..a0b53bbc44 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 90b5312e92..b860d16e2f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 2472a2d955..85d614b478 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index d1d5c8c332..c2610ec4e3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 6a740915da..f137988e26 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 91b4783b6f..465c7876f3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 5653ea4612..4cf7f101e9 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java index ef282584ac..03e791c09f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 4db0961a07..416fa8a65a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27f0904f0f..a61cc1bd71 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 255f805e72..12f575b243 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index ff9e654e61..3aeadd38a7 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 77b9a03185..c0d47bc8de 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java index 2ad8e45099..3f580995d2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 252f6cdb3e..40fb48b033 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java index b9d21a55ae..40e84f4dd0 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java @@ -19,7 +19,7 @@ package quests.Q00756_TopQualityPetra; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java index 948d7b6127..b5fee1d434 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java index 90a68d79e3..075ada8600 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java @@ -18,7 +18,7 @@ package quests.Q10303_CrossroadsBetweenLightAndDarkness; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java index a31abfa83b..b9a18ed239 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java index faa49497bf..3dd42f74db 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/ItemTable.java index 9182d52fcc..94b4547625 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index d508b71aef..fd2a491d66 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 0f8815bcc4..475f0085d8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index a213d965da..cab4dfa0e9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java index 426e9dd06f..6c261d6ded 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index cc0f4afb20..f7568ac960 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author Mobius diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 04ff799829..01eb1e0ea3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index 1b5d73308d..4ed0600683 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/ItemGrade.java index ad9e39c36d..11ea4c3bd8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 0f7be781b2..7bc7be8487 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index efa12b90bc..662dbf7c39 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 3d21c7ddf0..5f3eb28e8a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ArmorSet.java index 2a57f20a10..6b504526ef 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CombatFlag.java index 42a0ed06cb..faaeb77d79 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 739c5adb76..ba6a645d4d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java index 5b309bb46b..0936598410 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Seed.java index 13caeeb575..2dc7f967bb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java index a9796fbbb7..36f3461010 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeList.java index bbafcb1416..bea714862c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 444300d459..112976ec82 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -63,8 +63,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java index 4f2c1f0058..c52e6f0125 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java index 757412e9b3..ffae01611d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java index f080eee1cf..3b98be7a58 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -228,23 +228,23 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java index 1d10d176ce..3d1b9ef6c2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 2dd9a62da6..ed26029abd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b3fac75f08..8f7214b2d0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index bff7d7d596..678412218a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; public class PlayableStat extends CreatureStat diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 734517aa45..5e02dfdfa6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index da03c6b165..d93e4def4d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 6edc19b444..a62d59b876 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9c053efc5e..ebe8b7499f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 5b4ab6daf1..d68a40ee75 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 85c89d15ec..4c9bc6856c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 68990650dd..c08b648e55 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index a5fea7c6f6..347f281026 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 2f1424657f..b5b9ac8025 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -132,15 +132,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java index f65fcabe54..e0317b1c0a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java index 780dbd83e4..51ec6c9e3d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java index 81e8c9eb16..bf1d1237f1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index af538045b8..d391a4faf1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 79c69f739d..41f554b9e0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index b86121305d..b18ff0fce9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java index d01b97cc2c..fcd3b7c0ba 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.model.TradeItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Armor.java index a2f1c2d3e6..c2d573ea62 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Henna.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Henna.java new file mode 100644 index 0000000000..0d1de91388 --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -0,0 +1,183 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; + +/** + * Class for the Henna object. + * @author Zoey76 + */ +public class Henna +{ + private final int _dyeId; + private final int _dyeItemId; + private final boolean _isPremium; + private final Map _baseStats = new EnumMap<>(BaseStat.class); + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final int _duration; + private final List _skills; + private final List _wearClass; + + public Henna(StatSet set) + { + _dyeId = set.getInt("dyeId"); + _dyeItemId = set.getInt("dyeItemId"); + _isPremium = set.getBoolean("isPremium", false); + _baseStats.put(BaseStat.STR, set.getInt("str", 0)); + _baseStats.put(BaseStat.CON, set.getInt("con", 0)); + _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); + _baseStats.put(BaseStat.INT, set.getInt("int", 0)); + _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); + _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); + _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); + _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _duration = set.getInt("duration", -1); + _skills = new ArrayList<>(); + _wearClass = new ArrayList<>(); + } + + /** + * @return the dye Id. + */ + public int getDyeId() + { + return _dyeId; + } + + /** + * @return the item Id, required for this dye. + */ + public int getDyeItemId() + { + return _dyeItemId; + } + + /** + * @return true if this dye is premium. + */ + public boolean isPremium() + { + return _isPremium; + } + + public int getBaseStats(BaseStat stat) + { + return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); + } + + public Map getBaseStats() + { + return _baseStats; + } + + /** + * @return the wear fee, cost for adding this dye to the player. + */ + public int getWearFee() + { + return _wearFee; + } + + /** + * @return the wear count, the required count to add this dye to the player. + */ + public int getWearCount() + { + return _wearCount; + } + + /** + * @return the cancel fee, cost for removing this dye from the player. + */ + public int getCancelFee() + { + return _cancelFee; + } + + /** + * @return the cancel count, the retrieved amount of dye items after removing the dye. + */ + public int getCancelCount() + { + return _cancelCount; + } + + /** + * @return the duration of this dye. + */ + public int getDuration() + { + return _duration; + } + + /** + * @param skillList the list of skills related to this dye. + */ + public void setSkills(List skillList) + { + _skills.addAll(skillList); + } + + /** + * @return the skills related to this dye. + */ + public List getSkills() + { + return _skills; + } + + /** + * @return the list with the allowed classes to wear this dye. + */ + public List getAllowedWearClass() + { + return _wearClass; + } + + /** + * @param classId the class trying to wear this dye. + * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. + */ + public boolean isAllowedClass(ClassId classId) + { + return _wearClass.contains(classId); + } + + /** + * @param wearClassIds the list of classes that can wear this dye. + */ + public void setWearClassIds(List wearClassIds) + { + _wearClass.addAll(wearClassIds); + } +} \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index d58318fe05..4b205f2acf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 91% rename from L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index 5618132356..b289fa70ae 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.Collection; import java.util.Objects; @@ -22,9 +22,9 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Weapon.java new file mode 100644 index 0000000000..3ae599da0d --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -0,0 +1,311 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.enums.ItemSkillType; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is dedicated to the management of weapons. + */ +public class Weapon extends ItemTemplate +{ + private WeaponType _type; + private boolean _isMagicWeapon; + private int _soulShotCount; + private int _spiritShotCount; + private int _mpConsume; + private int _baseAttackRange; + private int _baseAttackRadius; + private int _baseAttackAngle; + private int _changeWeaponId; + + private int _reducedSoulshot; + private int _reducedSoulshotChance; + + private int _reducedMpConsume; + private int _reducedMpConsumeChance; + + private boolean _isForceEquip; + private boolean _isAttackWeapon; + private boolean _useWeaponSkillsOnly; + + /** + * Constructor for Weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. + */ + public Weapon(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_WEAPON; + _isMagicWeapon = set.getBoolean("is_magic_weapon", false); + _soulShotCount = set.getInt("soulshots", 0); + _spiritShotCount = set.getInt("spiritshots", 0); + _mpConsume = set.getInt("mp_consume", 0); + _baseAttackRange = set.getInt("attack_range", 40); + final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) + { + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + } + else + { + _baseAttackRadius = 40; + _baseAttackAngle = 240; // 360 - 120 + } + + final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); + _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; + _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; + + final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); + _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; + _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; + _changeWeaponId = set.getInt("change_weaponId", 0); + _isForceEquip = set.getBoolean("isForceEquip", false); + _isAttackWeapon = set.getBoolean("isAttackWeapon", true); + _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); + } + + /** + * @return the type of Weapon + */ + @Override + public WeaponType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + @Override + public boolean isWeapon() + { + return true; + } + + /** + * @return {@code true} if the weapon is magic, {@code false} otherwise. + */ + @Override + public boolean isMagicWeapon() + { + return _isMagicWeapon; + } + + /** + * @return the quantity of SoulShot used. + */ + public int getSoulShotCount() + { + return _soulShotCount; + } + + /** + * @return the quantity of SpiritShot used. + */ + public int getSpiritShotCount() + { + return _spiritShotCount; + } + + /** + * @return the reduced quantity of SoultShot used. + */ + public int getReducedSoulShot() + { + return _reducedSoulshot; + } + + /** + * @return the chance to use Reduced SoultShot. + */ + public int getReducedSoulShotChance() + { + return _reducedSoulshotChance; + } + + /** + * @return the MP consumption with the weapon. + */ + public int getMpConsume() + { + return _mpConsume; + } + + public int getBaseAttackRange() + { + return _baseAttackRange; + } + + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + + /** + * @return the reduced MP consumption with the weapon. + */ + public int getReducedMpConsume() + { + return _reducedMpConsume; + } + + /** + * @return the chance to use getReducedMpConsume() + */ + public int getReducedMpConsumeChance() + { + return _reducedMpConsumeChance; + } + + /** + * @return the Id in which weapon this weapon can be changed. + */ + public int getChangeWeaponId() + { + return _changeWeaponId; + } + + /** + * @return {@code true} if the weapon is force equip, {@code false} otherwise. + */ + public boolean isForceEquip() + { + return _isForceEquip; + } + + /** + * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. + */ + public boolean isAttackWeapon() + { + return _isAttackWeapon; + } + + /** + * @return {@code true} if the weapon is skills only, {@code false} otherwise. + */ + public boolean useWeaponSkillsOnly() + { + return _useWeaponSkillsOnly; + } + + /** + * @param caster the Creature pointing out the caster + * @param target the Creature pointing out the target + * @param trigger + * @param type + */ + public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) + { + forEachSkill(type, holder -> + { + final Skill skill = holder.getSkill(); + if (Rnd.get(100) >= holder.getChance()) + { + return; + } + + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // Trigger only if both are good or bad magic. + if (trigger.isBad() != skill.isBad()) + { + return; + } + + // No Trigger if not Magic Skill or is toggle + if (trigger.isMagic() != skill.isMagic()) + { + return; + } + + // No Trigger if skill is toggle + if (trigger.isToggle()) + { + return; + } + + if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) + { + return; + } + } + + // Skill condition not met + if (!skill.checkCondition(caster, target)) + { + return; + } + + skill.activateSkill(caster, target); + + // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // notify quests of a skill use + if (caster.isPlayer()) + { + World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); + } + if (caster.isPlayer()) + { + final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); + sm.addSkillName(skill); + caster.sendPacket(sm); + } + } + }); + } +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java similarity index 93% rename from L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java rename to L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index a568389489..610e720125 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; import java.time.Duration; import java.util.ArrayList; @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java new file mode 100644 index 0000000000..6f73983c0e --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -0,0 +1,65 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import java.util.EnumMap; +import java.util.Map; + +import org.l2jmobius.gameserver.model.StatSet; + +/** + * @author UnAfraid + */ +public class CombinationItem +{ + private final int _itemOne; + private final int _itemTwo; + private final int _chance; + private final Map _rewards = new EnumMap<>(CombinationItemType.class); + + public CombinationItem(StatSet set) + { + _itemOne = set.getInt("one"); + _itemTwo = set.getInt("two"); + _chance = set.getInt("chance"); + } + + public int getItemOne() + { + return _itemOne; + } + + public int getItemTwo() + { + return _itemTwo; + } + + public int getChance() + { + return _chance; + } + + public void addReward(CombinationItemReward item) + { + _rewards.put(item.getType(), item); + } + + public CombinationItemReward getReward(CombinationItemType type) + { + return _rewards.get(type); + } +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java similarity index 90% rename from L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java rename to L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 6745b1d5e4..76176d2ab3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java similarity index 90% rename from L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java rename to L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java index fe698d8e2a..1099b77054 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 93% rename from L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index f543c70ebd..ea29d773db 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.stats.Stat; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java similarity index 90% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java rename to L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java index 12b33e468f..308f08c38b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 0028a98c4c..5b8d1089b7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -75,15 +75,15 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java similarity index 94% rename from L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java rename to L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java index 2920bda8fa..d325c3ffa9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Crystal Type enumerated. diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 93% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index 5730665d9f..c9c153923e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * EtcItem Type enumerated. diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 8323d4bdc7..06760564d7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 1d64999966..6eb95527e0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -54,14 +54,14 @@ import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 55f36d4476..f6b56b0190 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Henna.java deleted file mode 100644 index 426a12682a..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Henna.java +++ /dev/null @@ -1,183 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; - -import org.l2jmobius.gameserver.enums.ClassId; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; - -/** - * Class for the Henna object. - * @author Zoey76 - */ -public class Henna -{ - private final int _dyeId; - private final int _dyeItemId; - private final boolean _isPremium; - private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wearFee; - private final int _wearCount; - private final int _cancelFee; - private final int _cancelCount; - private final int _duration; - private final List _skills; - private final List _wearClass; - - public Henna(StatSet set) - { - _dyeId = set.getInt("dyeId"); - _dyeItemId = set.getInt("dyeItemId"); - _isPremium = set.getBoolean("isPremium", false); - _baseStats.put(BaseStat.STR, set.getInt("str", 0)); - _baseStats.put(BaseStat.CON, set.getInt("con", 0)); - _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); - _baseStats.put(BaseStat.INT, set.getInt("int", 0)); - _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); - _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); - _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wearFee = set.getInt("wear_fee"); - _wearCount = set.getInt("wear_count"); - _cancelFee = set.getInt("cancel_fee"); - _cancelCount = set.getInt("cancel_count"); - _duration = set.getInt("duration", -1); - _skills = new ArrayList<>(); - _wearClass = new ArrayList<>(); - } - - /** - * @return the dye Id. - */ - public int getDyeId() - { - return _dyeId; - } - - /** - * @return the item Id, required for this dye. - */ - public int getDyeItemId() - { - return _dyeItemId; - } - - /** - * @return true if this dye is premium. - */ - public boolean isPremium() - { - return _isPremium; - } - - public int getBaseStats(BaseStat stat) - { - return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); - } - - public Map getBaseStats() - { - return _baseStats; - } - - /** - * @return the wear fee, cost for adding this dye to the player. - */ - public int getWearFee() - { - return _wearFee; - } - - /** - * @return the wear count, the required count to add this dye to the player. - */ - public int getWearCount() - { - return _wearCount; - } - - /** - * @return the cancel fee, cost for removing this dye from the player. - */ - public int getCancelFee() - { - return _cancelFee; - } - - /** - * @return the cancel count, the retrieved amount of dye items after removing the dye. - */ - public int getCancelCount() - { - return _cancelCount; - } - - /** - * @return the duration of this dye. - */ - public int getDuration() - { - return _duration; - } - - /** - * @param skillList the list of skills related to this dye. - */ - public void setSkills(List skillList) - { - _skills.addAll(skillList); - } - - /** - * @return the skills related to this dye. - */ - public List getSkills() - { - return _skills; - } - - /** - * @return the list with the allowed classes to wear this dye. - */ - public List getAllowedWearClass() - { - return _wearClass; - } - - /** - * @param classId the class trying to wear this dye. - * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. - */ - public boolean isAllowedClass(ClassId classId) - { - return _wearClass.contains(classId); - } - - /** - * @param wearClassIds the list of classes that can wear this dye. - */ - public void setWearClassIds(List wearClassIds) - { - _wearClass.addAll(wearClassIds); - } -} \ No newline at end of file diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Weapon.java deleted file mode 100644 index 85bb22d23b..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is dedicated to the management of weapons. - */ -public class Weapon extends ItemTemplate -{ - private WeaponType _type; - private boolean _isMagicWeapon; - private int _soulShotCount; - private int _spiritShotCount; - private int _mpConsume; - private int _baseAttackRange; - private int _baseAttackRadius; - private int _baseAttackAngle; - private int _changeWeaponId; - - private int _reducedSoulshot; - private int _reducedSoulshotChance; - - private int _reducedMpConsume; - private int _reducedMpConsumeChance; - - private boolean _isForceEquip; - private boolean _isAttackWeapon; - private boolean _useWeaponSkillsOnly; - - /** - * Constructor for Weapon. - * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. - */ - public Weapon(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_WEAPON; - _isMagicWeapon = set.getBoolean("is_magic_weapon", false); - _soulShotCount = set.getInt("soulshots", 0); - _spiritShotCount = set.getInt("spiritshots", 0); - _mpConsume = set.getInt("mp_consume", 0); - _baseAttackRange = set.getInt("attack_range", 40); - final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) - { - _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); - } - else - { - _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 - } - - final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); - _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; - _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; - - final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); - _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; - _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; - _changeWeaponId = set.getInt("change_weaponId", 0); - _isForceEquip = set.getBoolean("isForceEquip", false); - _isAttackWeapon = set.getBoolean("isAttackWeapon", true); - _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); - } - - /** - * @return the type of Weapon - */ - @Override - public WeaponType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - @Override - public boolean isWeapon() - { - return true; - } - - /** - * @return {@code true} if the weapon is magic, {@code false} otherwise. - */ - @Override - public boolean isMagicWeapon() - { - return _isMagicWeapon; - } - - /** - * @return the quantity of SoulShot used. - */ - public int getSoulShotCount() - { - return _soulShotCount; - } - - /** - * @return the quantity of SpiritShot used. - */ - public int getSpiritShotCount() - { - return _spiritShotCount; - } - - /** - * @return the reduced quantity of SoultShot used. - */ - public int getReducedSoulShot() - { - return _reducedSoulshot; - } - - /** - * @return the chance to use Reduced SoultShot. - */ - public int getReducedSoulShotChance() - { - return _reducedSoulshotChance; - } - - /** - * @return the MP consumption with the weapon. - */ - public int getMpConsume() - { - return _mpConsume; - } - - public int getBaseAttackRange() - { - return _baseAttackRange; - } - - public int getBaseAttackRadius() - { - return _baseAttackRadius; - } - - public int getBaseAttackAngle() - { - return _baseAttackAngle; - } - - /** - * @return the reduced MP consumption with the weapon. - */ - public int getReducedMpConsume() - { - return _reducedMpConsume; - } - - /** - * @return the chance to use getReducedMpConsume() - */ - public int getReducedMpConsumeChance() - { - return _reducedMpConsumeChance; - } - - /** - * @return the Id in which weapon this weapon can be changed. - */ - public int getChangeWeaponId() - { - return _changeWeaponId; - } - - /** - * @return {@code true} if the weapon is force equip, {@code false} otherwise. - */ - public boolean isForceEquip() - { - return _isForceEquip; - } - - /** - * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. - */ - public boolean isAttackWeapon() - { - return _isAttackWeapon; - } - - /** - * @return {@code true} if the weapon is skills only, {@code false} otherwise. - */ - public boolean useWeaponSkillsOnly() - { - return _useWeaponSkillsOnly; - } - - /** - * @param caster the Creature pointing out the caster - * @param target the Creature pointing out the target - * @param trigger - * @param type - */ - public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) - { - forEachSkill(type, holder -> - { - final Skill skill = holder.getSkill(); - if (Rnd.get(100) >= holder.getChance()) - { - return; - } - - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // Trigger only if both are good or bad magic. - if (trigger.isBad() != skill.isBad()) - { - return; - } - - // No Trigger if not Magic Skill or is toggle - if (trigger.isMagic() != skill.isMagic()) - { - return; - } - - // No Trigger if skill is toggle - if (trigger.isToggle()) - { - return; - } - - if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) - { - return; - } - } - - // Skill condition not met - if (!skill.checkCondition(caster, target)) - { - return; - } - - skill.activateSkill(caster, target); - - // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // notify quests of a skill use - if (caster.isPlayer()) - { - World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); - } - if (caster.isPlayer()) - { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); - sm.addSkillName(skill); - caster.sendPacket(sm); - } - } - }); - } -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java deleted file mode 100644 index a2897ba911..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import java.util.EnumMap; -import java.util.Map; - -import org.l2jmobius.gameserver.model.StatSet; - -/** - * @author UnAfraid - */ -public class CombinationItem -{ - private final int _itemOne; - private final int _itemTwo; - private final int _chance; - private final Map _rewards = new EnumMap<>(CombinationItemType.class); - - public CombinationItem(StatSet set) - { - _itemOne = set.getInt("one"); - _itemTwo = set.getInt("two"); - _chance = set.getInt("chance"); - } - - public int getItemOne() - { - return _itemOne; - } - - public int getItemTwo() - { - return _itemTwo; - } - - public int getChance() - { - return _chance; - } - - public void addReward(CombinationItemReward item) - { - _rewards.put(item.getType(), item); - } - - public CombinationItemReward getReward(CombinationItemType type) - { - return _rewards.get(type); - } -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 36ec6f7eea..7949396130 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 4cfb17a0ba..b9991074a2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java index 5f3d83eb7d..bdf8218191 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -65,8 +65,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java index 80eec709d8..1e18bcb9ad 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index e66e52c0e8..35b85934ab 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java index ab75417b52..6e65b03682 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index da2c567d17..a99ddb2dfe 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 402c603dac..645156f9c1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ee53743fce..31df739b0f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index c37fedbfb8..068f5c9368 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index ef63d53ef4..0546560e58 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 3eda159a36..c524cb94f1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index ddbf6666c9..c4b2ee6602 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index 45301710ad..e9fb2b0c78 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index de0c583a95..59a7a0e0bb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index cfb6455ad0..31d29ef3dd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index bcaba26779..a91ba39468 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -42,8 +42,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 5b929aae30..0d9037eb49 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -53,8 +53,8 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index bdcaa09947..b6effdbcb9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index f4872a36bb..b7a2c5c6c4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index d6df3726cc..47214311ac 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 0d59d2ff65..e8d7efa6b0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 9054640b60..2f12cc278e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 2ca0f283f9..4f351a636b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 6cc03e2c2b..48cdb8e80b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index ac45c4ce91..09502af840 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 3cee24bfb0..161b8d0cab 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 3935cea12a..cf7d7e0219 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java index 3d7c93c85c..c9b6d4dd3a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java @@ -22,8 +22,8 @@ import java.util.Set; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExTryEnchantArtifactResult; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 29f7828f27..a9fd8d923a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 12bc7c708d..79e1193ac0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index a438e21228..eab1e325f5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 469ee06f48..70e2f43664 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 1dca606dcd..36256ab955 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 1ee323a63c..7da966ce9f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 989d2e582f..2c715b4efb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d7fcffbdb5..4468b67642 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 35f568fc0b..0ab9577343 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 9f321c1803..7ca2a01f2e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index ce66388a02..ecb0ab9738 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index de4094b252..db5981de3d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 9bddf5f507..19a6780f98 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 61920f471b..f89be1cfcb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index ff361e97a4..1840fcded7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 17fa6aeaf2..f02aaa9ace 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index ca043af307..74f5736cf7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 251b8c7719..964fffd4a3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 6800a418cc..d257cb06cc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AlchemyResult; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index f144094dda..95a85c269b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 80d2ecee11..e5c25df330 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index e7a8e8baf6..7fbd7ebecb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 56cf3b84cc..b9a7aadbf7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index e8f3c75825..912dae684a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 25c9792ec1..3220827fbb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index 628878dda6..76e42799c4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51cd76618e..af8b12547e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 38bda2e6fb..e9cd6a88b8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 61fd93e55c..6063a54535 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index df2409c89e..0fc5fb1c75 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 12359bcd17..2cea176d69 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 93588924fe..077f33cb49 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 07725028a6..76375a86f7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c5c1d1141..81a384642c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index e4fb9e4160..b65005003d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 51abfa9d3e..f49138fafe 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 809a864983..395487097c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 2fe9967302..30dc837721 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 6691a8ea4f..cf3d83263f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 97b7b53cae..cb1379ac29 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index f826c75d4b..844fad86c7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index bd768c74e2..c4598a72e6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index a5616075a6..e1da19cc8f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ced39204d3..fbb5c84dfe 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4068629bde..d05590cbde 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index c49a1d369f..4d605cfbb4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index d48b66c6ef..9d9b24a54f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c742d534c4..c59568bf1d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index a22b36335e..35ca986d35 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 271ec4401b..37150ec357 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 6b8cd1358f..c32d4f7c04 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/DocumentBase.java index 65e18e4a0e..bcbe96ad19 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -134,9 +137,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index e525165bcb..38cb684c22 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java index a0deee3c2f..bd823eaea8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExGetPremiumItemList; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DragonWeaponListeners.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DragonWeaponListeners.java index 09171d6d97..c50af03d70 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DragonWeaponListeners.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/DragonWeaponListeners.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemEquip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/SiegeGuards.java index 07d6a45613..ea67a6b16c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 69349fc9ef..5f7c45d595 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.actor.transform.Transform; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionCancel; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 418ed93b2a..4081019df2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index a53c69fb80..680745b29d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 5b1db54836..e7113941ec 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index f73f3c2e73..5d3caadfd5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 0a82f9968d..35d31315ad 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index ef698d3144..98c614b7e5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 59e5b148a1..76d08b7a2b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index e1681d19a4..8e1d2e4ebd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index f7054e99e9..17d76b1bf6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index 1d104a4069..bb6ed54b11 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index c5a58222c9..81749c89a6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 19226dce0f..6cd820aedf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index ab33e22a5f..adc092f771 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 31621251be..62d5debb32 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index fae553ff45..991d2217b5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 7d0f0b43ba..9723633d69 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 437b502a95..b8985f0fef 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 277a03c294..c98e55ac10 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java index 2e2e322e86..6183d5637e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index bfc65e27f5..879983272a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index d592bba597..96b98f6548 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index aa2eabd231..5690696b29 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 705ed225aa..a74d84251f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index ebbd33bda0..f952b58fa2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Heal.java index d480511447..c69477f113 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index ecebff8fcf..bbe94f05d2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d55c2897df..a58e246a0d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java index 06f3fb2e45..4e0e25e56f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 8f81770a04..53f0529429 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index af19b2276d..ded8b9bcbc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 7e60c89db5..2ca2c2fc70 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 6a58fbf31b..f4ff6be84c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java index 30b8b4d117..b5739976ad 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index c84a1eef1c..dc98162c19 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java index d43c368f7c..1d227df4d5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b485046a39..25c237e53f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 83860039e2..a22aaf477d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java index 0767b28991..6c95915b62 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index 5461a0259e..7b898d2461 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index d21bbf334e..ff11355aa7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index ba621c653f..f553a0c846 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 9b16668969..119fe1f81e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index edfb9e4808..1e0543c0ab 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index f45a96746c..7d8ad117db 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index e1384fe3e2..b527922050 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java index bba869e737..4dc82b38bd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 4db0961a07..416fa8a65a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index c6d8ec7a1b..1f44066740 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 98ae8c4eaf..353347df87 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index ff9e654e61..3aeadd38a7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 77b9a03185..c0d47bc8de 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java index b9d21a55ae..40e84f4dd0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java @@ -19,7 +19,7 @@ package quests.Q00756_TopQualityPetra; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java index 90a68d79e3..075ada8600 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java @@ -18,7 +18,7 @@ package quests.Q10303_CrossroadsBetweenLightAndDarkness; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java index 1c5d402ca7..5fb5a9daaf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q10814_BefittingOfTheStatus/Q10814_BefittingOfTheStatus.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java index faa49497bf..3dd42f74db 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java index 9182d52fcc..94b4547625 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index d508b71aef..fd2a491d66 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 0f8815bcc4..475f0085d8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index a213d965da..cab4dfa0e9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java index 426e9dd06f..6c261d6ded 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index cc0f4afb20..f7568ac960 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author Mobius diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 3f7c8ab166..02089dc8c1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index 1b5d73308d..4ed0600683 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/ItemGrade.java index ad9e39c36d..11ea4c3bd8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 557c5e108a..48a6f07b3c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index efa12b90bc..662dbf7c39 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index ce03808800..7799768d15 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ArmorSet.java index 2a57f20a10..6b504526ef 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CombatFlag.java index e726f912f1..e0487f9079 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CursedWeapon.java index d9dd1c9b65..2301aacbc4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java index 12321a158f..1bd1eeb1cc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Seed.java index 13caeeb575..2dc7f967bb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java index d199976edc..a9fd529ecc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeList.java index bbafcb1416..bea714862c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0eca80504c..e3f680ef86 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -63,8 +63,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index 039971f920..44bec02ad9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java index 757412e9b3..ffae01611d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java index c6ff485419..615fa787f5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -236,22 +236,22 @@ import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java index 4eb006b5f2..5c0f977ccc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 2dd9a62da6..ed26029abd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b3fac75f08..8f7214b2d0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index bff7d7d596..678412218a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; public class PlayableStat extends CreatureStat diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 9e36f47905..8f249fd451 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index da03c6b165..d93e4def4d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 6edc19b444..a62d59b876 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9c053efc5e..ebe8b7499f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 5b4ab6daf1..d68a40ee75 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 85c89d15ec..4c9bc6856c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 68990650dd..c08b648e55 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java index 58bd23cf07..5edfafb200 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index a5fea7c6f6..347f281026 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 2f1424657f..b5b9ac8025 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -132,15 +132,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java index f65fcabe54..e0317b1c0a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java index 780dbd83e4..51ec6c9e3d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java index 81e8c9eb16..bf1d1237f1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index af538045b8..d391a4faf1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 79c69f739d..41f554b9e0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index b86121305d..b18ff0fce9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java index d01b97cc2c..fcd3b7c0ba 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.model.TradeItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/Armor.java index a2f1c2d3e6..c2d573ea62 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/Henna.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/Henna.java new file mode 100644 index 0000000000..0d1de91388 --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -0,0 +1,183 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; + +/** + * Class for the Henna object. + * @author Zoey76 + */ +public class Henna +{ + private final int _dyeId; + private final int _dyeItemId; + private final boolean _isPremium; + private final Map _baseStats = new EnumMap<>(BaseStat.class); + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final int _duration; + private final List _skills; + private final List _wearClass; + + public Henna(StatSet set) + { + _dyeId = set.getInt("dyeId"); + _dyeItemId = set.getInt("dyeItemId"); + _isPremium = set.getBoolean("isPremium", false); + _baseStats.put(BaseStat.STR, set.getInt("str", 0)); + _baseStats.put(BaseStat.CON, set.getInt("con", 0)); + _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); + _baseStats.put(BaseStat.INT, set.getInt("int", 0)); + _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); + _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); + _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); + _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _duration = set.getInt("duration", -1); + _skills = new ArrayList<>(); + _wearClass = new ArrayList<>(); + } + + /** + * @return the dye Id. + */ + public int getDyeId() + { + return _dyeId; + } + + /** + * @return the item Id, required for this dye. + */ + public int getDyeItemId() + { + return _dyeItemId; + } + + /** + * @return true if this dye is premium. + */ + public boolean isPremium() + { + return _isPremium; + } + + public int getBaseStats(BaseStat stat) + { + return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); + } + + public Map getBaseStats() + { + return _baseStats; + } + + /** + * @return the wear fee, cost for adding this dye to the player. + */ + public int getWearFee() + { + return _wearFee; + } + + /** + * @return the wear count, the required count to add this dye to the player. + */ + public int getWearCount() + { + return _wearCount; + } + + /** + * @return the cancel fee, cost for removing this dye from the player. + */ + public int getCancelFee() + { + return _cancelFee; + } + + /** + * @return the cancel count, the retrieved amount of dye items after removing the dye. + */ + public int getCancelCount() + { + return _cancelCount; + } + + /** + * @return the duration of this dye. + */ + public int getDuration() + { + return _duration; + } + + /** + * @param skillList the list of skills related to this dye. + */ + public void setSkills(List skillList) + { + _skills.addAll(skillList); + } + + /** + * @return the skills related to this dye. + */ + public List getSkills() + { + return _skills; + } + + /** + * @return the list with the allowed classes to wear this dye. + */ + public List getAllowedWearClass() + { + return _wearClass; + } + + /** + * @param classId the class trying to wear this dye. + * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. + */ + public boolean isAllowedClass(ClassId classId) + { + return _wearClass.contains(classId); + } + + /** + * @param wearClassIds the list of classes that can wear this dye. + */ + public void setWearClassIds(List wearClassIds) + { + _wearClass.addAll(wearClassIds); + } +} \ No newline at end of file diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index d58318fe05..4b205f2acf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 91% rename from L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index 5618132356..b289fa70ae 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.Collection; import java.util.Objects; @@ -22,9 +22,9 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/Weapon.java similarity index 94% rename from L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Weapon.java rename to L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/Weapon.java index 832169f5f1..4599d5047f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java similarity index 93% rename from L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java rename to L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index a568389489..610e720125 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.appearance; +package org.l2jmobius.gameserver.model.item.appearance; import java.time.Duration; import java.util.ArrayList; @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java new file mode 100644 index 0000000000..6f73983c0e --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -0,0 +1,65 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import java.util.EnumMap; +import java.util.Map; + +import org.l2jmobius.gameserver.model.StatSet; + +/** + * @author UnAfraid + */ +public class CombinationItem +{ + private final int _itemOne; + private final int _itemTwo; + private final int _chance; + private final Map _rewards = new EnumMap<>(CombinationItemType.class); + + public CombinationItem(StatSet set) + { + _itemOne = set.getInt("one"); + _itemTwo = set.getInt("two"); + _chance = set.getInt("chance"); + } + + public int getItemOne() + { + return _itemOne; + } + + public int getItemTwo() + { + return _itemTwo; + } + + public int getChance() + { + return _chance; + } + + public void addReward(CombinationItemReward item) + { + _rewards.put(item.getType(), item); + } + + public CombinationItemReward getReward(CombinationItemType type) + { + return _rewards.get(type); + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java new file mode 100644 index 0000000000..76176d2ab3 --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -0,0 +1,212 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.logging.Logger; + +import org.l2jmobius.commons.util.CommonUtil; +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public abstract class AbstractEnchantItem +{ + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); + + private static final ItemType[] ENCHANT_TYPES = new ItemType[] + { + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + EtcItemType.BLESS_ENCHT_AM, + EtcItemType.BLESS_ENCHT_AM_DOWN, + EtcItemType.BLESS_ENCHT_WP, + EtcItemType.ENCHT_AM, + EtcItemType.ENCHT_WP, + EtcItemType.ENCHT_WP_DOWN, + EtcItemType.ENCHT_AM_DOWN, + EtcItemType.GIANT_ENCHT_AM, + EtcItemType.GIANT_ENCHT_WP, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + }; + + private final int _id; + private final CrystalType _grade; + private final int _minEnchantLevel; + private final int _maxEnchantLevel; + private final int _safeEnchantLevel; + private final int _randomEnchantMin; + private final int _randomEnchantMax; + private final double _bonusRate; + + public AbstractEnchantItem(StatSet set) + { + _id = set.getInt("id"); + if (getItem() == null) + { + throw new NullPointerException(); + } + else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) + { + throw new IllegalAccessError(); + } + _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); + _minEnchantLevel = set.getInt("minEnchant", 0); + _maxEnchantLevel = set.getInt("maxEnchant", 127); + _safeEnchantLevel = set.getInt("safeEnchant", 0); + _randomEnchantMin = set.getInt("randomEnchantMin", 1); + _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); + _bonusRate = set.getDouble("bonusRate", 0); + } + + /** + * @return id of current item + */ + public int getId() + { + return _id; + } + + /** + * @return bonus chance that would be added + */ + public double getBonusRate() + { + return _bonusRate; + } + + /** + * @return {@link ItemTemplate} current item/scroll + */ + public ItemTemplate getItem() + { + return ItemTable.getInstance().getTemplate(_id); + } + + /** + * @return grade of the item/scroll. + */ + public CrystalType getGrade() + { + return _grade; + } + + /** + * @return {@code true} if scroll is for weapon, {@code false} for armor + */ + public abstract boolean isWeapon(); + + /** + * @return the minimum enchant level that this scroll/item can be used with + */ + public int getMinEnchantLevel() + { + return _minEnchantLevel; + } + + /** + * @return the maximum enchant level that this scroll/item can be used with + */ + public int getMaxEnchantLevel() + { + return _maxEnchantLevel; + } + + /** + * @return the safe enchant level of this scroll/item + */ + public int getSafeEnchant() + { + return _safeEnchantLevel; + } + + /** + * @return the minimum random enchant level of this scroll/item + */ + public int getRandomEnchantMin() + { + return _randomEnchantMin; + } + + /** + * @return the maximum random enchant level of this scroll/item + */ + public int getRandomEnchantMax() + { + return _randomEnchantMax; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem + * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise + */ + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if (itemToEnchant == null) + { + return false; + } + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + { + return false; + } + else if (!isValidItemType(itemToEnchant.getItem().getType2())) + { + return false; + } + else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) + { + return false; + } + else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + { + return false; + } + return true; + } + + /** + * @param type2 + * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise + */ + private boolean isValidItemType(int type2) + { + if (type2 == ItemTemplate.TYPE2_WEAPON) + { + return isWeapon(); + } + else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) + { + return !isWeapon(); + } + return false; + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java similarity index 90% rename from L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java rename to L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java index fe698d8e2a..1099b77054 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java new file mode 100644 index 0000000000..ea29d773db --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -0,0 +1,225 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.HashSet; +import java.util.Set; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.data.xml.EnchantItemData; +import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author UnAfraid + */ +public class EnchantScroll extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isBlessedDown; + private final boolean _isSafe; + private final boolean _isGiant; + private final int _scrollGroupId; + private Set _items; + + public EnchantScroll(StatSet set) + { + super(set); + _scrollGroupId = set.getInt("scrollGroupId", 0); + + final ItemType type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN); + _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + /** + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will reset to 0), {@code false} otherwise + */ + public boolean isBlessed() + { + return _isBlessed; + } + + /** + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise + */ + public boolean isBlessedDown() + { + return _isBlessedDown; + } + + /** + * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise + */ + public boolean isSafe() + { + return _isSafe; + } + + public boolean isGiant() + { + return _isGiant; + } + + /** + * @return id of scroll group that should be used + */ + public int getScrollGroupId() + { + return _scrollGroupId; + } + + /** + * Enforces current scroll to use only those items as possible items to enchant + * @param itemId + */ + public void addItem(int itemId) + { + if (_items == null) + { + _items = new HashSet<>(); + } + _items.add(itemId); + } + + public Set getItems() + { + return _items; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem the support item used when enchanting (can be null) + * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise + */ + @Override + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if ((_items != null) && !_items.contains(itemToEnchant.getId())) + { + return false; + } + else if ((supportItem != null)) + { + if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed())) + { + return false; + } + else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant())) + { + return false; + } + else if (!supportItem.isValid(itemToEnchant, supportItem)) + { + return false; + } + else if (supportItem.isWeapon() != isWeapon()) + { + return false; + } + } + if (_items == null) + { + for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls()) + { + if (scroll.getId() == getId()) + { + continue; + } + final Set scrollItems = scroll.getItems(); + if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId())) + { + return false; + } + } + } + return super.isValid(itemToEnchant, supportItem); + } + + /** + * @param player + * @param enchantItem + * @return the chance of current scroll's group. + */ + public double getChance(Player player, Item enchantItem) + { + if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) + { + LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); + return -1; + } + + final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); + if (group == null) + { + LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); + return -1; + } + + if ((getSafeEnchant() > 0) && (enchantItem.getEnchantLevel() < getSafeEnchant())) + { + return 100; + } + + return group.getChance(enchantItem.getEnchantLevel()); + } + + /** + * @param player + * @param enchantItem + * @param supportItem + * @return the total chance for success rate of this scroll + */ + public EnchantResultType calculateSuccess(Player player, Item enchantItem, EnchantSupportItem supportItem) + { + if (!isValid(enchantItem, supportItem)) + { + return EnchantResultType.ERROR; + } + + final double chance = getChance(player, enchantItem); + if (chance == -1) + { + return EnchantResultType.ERROR; + } + + final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; + final double bonusRate = getBonusRate(); + final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; + final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100); + final double random = 100 * Rnd.nextDouble(); + final boolean success = (random < finalChance) || player.tryLuck(); + return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE; + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java new file mode 100644 index 0000000000..308f08c38b --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -0,0 +1,64 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public class EnchantSupportItem extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isDown; + private final boolean _isGiant; + private final ItemType type; + + public EnchantSupportItem(StatSet set) + { + super(set); + type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.ENCHT_WP_DOWN) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isDown = (type == EtcItemType.ENCHT_AM_DOWN) || (type == EtcItemType.ENCHT_WP_DOWN); + _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + public boolean isBlessed() + { + return _isBlessed; + } + + public boolean isDown() + { + return _isDown; + } + + public boolean isGiant() + { + return _isGiant; + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 0028a98c4c..5b8d1089b7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -75,15 +75,15 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java similarity index 94% rename from L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java rename to L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java index 2920bda8fa..d325c3ffa9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Crystal Type enumerated. diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java new file mode 100644 index 0000000000..c9c153923e --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -0,0 +1,106 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * EtcItem Type enumerated. + */ +public enum EtcItemType implements ItemType +{ + NONE, + SCROLL, + ARROW, + POTION, + SPELLBOOK, + RECIPE, + MATERIAL, + PET_COLLAR, + CASTLE_GUARD, + DYE, + SEED, + SEED2, + HARVEST, + LOTTO, + RACE_TICKET, + TICKET_OF_LORD, + LURE, + CROP, + MATURECROP, + ENCHT_WP, + ENCHT_AM, + ENCHT_AM_DOWN, + ENCHT_WP_DOWN, + GIANT_ENCHT_WP, + GIANT_ENCHT_AM, + BLESS_ENCHT_WP, + BLESS_ENCHT_AM, + BLESS_ENCHT_AM_DOWN, + COUPON, + ELIXIR, + ENCHT_ATTR, + ENCHT_ATTR_CURSED, + BOLT, + ENCHT_ATTR_INC_PROP_ENCHT_WP, + ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_RUNE, + ENCHT_ATTRT_RUNE_SELECT, + TELEPORTBOOKMARK, + CHANGE_ATTR, + SOULSHOT, + SHAPE_SHIFTING_WP, + BLESS_SHAPE_SHIFTING_WP, + SHAPE_SHIFTING_WP_FIXED, + SHAPE_SHIFTING_AM, + BLESS_SHAPE_SHIFTING_AM, + SHAPE_SHIFTING_AM_FIXED, + SHAPE_SHIFTING_HAIRACC, + BLESS_SHAPE_SHIFTING_HAIRACC, + SHAPE_SHIFTING_HAIRACC_FIXED, + RESTORE_SHAPE_SHIFTING_WP, + RESTORE_SHAPE_SHIFTING_AM, + RESTORE_SHAPE_SHIFTING_HAIRACC, + RESTORE_SHAPE_SHIFTING_ALLITEM, + BLESS_INC_PROP_ENCHT_WP, + BLESS_INC_PROP_ENCHT_AM, + CARD_EVENT, + SHAPE_SHIFTING_ALLITEM_FIXED, + MULTI_ENCHT_WP, + MULTI_ENCHT_AM, + MULTI_INC_PROB_ENCHT_WP, + MULTI_INC_PROB_ENCHT_AM, + SOUL_CRYSTAL, + ENSOUL_STONE; + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return 0; + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 8323d4bdc7..06760564d7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 268e200f14..4856157fb9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -54,14 +54,14 @@ import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 55f36d4476..f6b56b0190 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Henna.java deleted file mode 100644 index 426a12682a..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Henna.java +++ /dev/null @@ -1,183 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; - -import org.l2jmobius.gameserver.enums.ClassId; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; - -/** - * Class for the Henna object. - * @author Zoey76 - */ -public class Henna -{ - private final int _dyeId; - private final int _dyeItemId; - private final boolean _isPremium; - private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wearFee; - private final int _wearCount; - private final int _cancelFee; - private final int _cancelCount; - private final int _duration; - private final List _skills; - private final List _wearClass; - - public Henna(StatSet set) - { - _dyeId = set.getInt("dyeId"); - _dyeItemId = set.getInt("dyeItemId"); - _isPremium = set.getBoolean("isPremium", false); - _baseStats.put(BaseStat.STR, set.getInt("str", 0)); - _baseStats.put(BaseStat.CON, set.getInt("con", 0)); - _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); - _baseStats.put(BaseStat.INT, set.getInt("int", 0)); - _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); - _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); - _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wearFee = set.getInt("wear_fee"); - _wearCount = set.getInt("wear_count"); - _cancelFee = set.getInt("cancel_fee"); - _cancelCount = set.getInt("cancel_count"); - _duration = set.getInt("duration", -1); - _skills = new ArrayList<>(); - _wearClass = new ArrayList<>(); - } - - /** - * @return the dye Id. - */ - public int getDyeId() - { - return _dyeId; - } - - /** - * @return the item Id, required for this dye. - */ - public int getDyeItemId() - { - return _dyeItemId; - } - - /** - * @return true if this dye is premium. - */ - public boolean isPremium() - { - return _isPremium; - } - - public int getBaseStats(BaseStat stat) - { - return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); - } - - public Map getBaseStats() - { - return _baseStats; - } - - /** - * @return the wear fee, cost for adding this dye to the player. - */ - public int getWearFee() - { - return _wearFee; - } - - /** - * @return the wear count, the required count to add this dye to the player. - */ - public int getWearCount() - { - return _wearCount; - } - - /** - * @return the cancel fee, cost for removing this dye from the player. - */ - public int getCancelFee() - { - return _cancelFee; - } - - /** - * @return the cancel count, the retrieved amount of dye items after removing the dye. - */ - public int getCancelCount() - { - return _cancelCount; - } - - /** - * @return the duration of this dye. - */ - public int getDuration() - { - return _duration; - } - - /** - * @param skillList the list of skills related to this dye. - */ - public void setSkills(List skillList) - { - _skills.addAll(skillList); - } - - /** - * @return the skills related to this dye. - */ - public List getSkills() - { - return _skills; - } - - /** - * @return the list with the allowed classes to wear this dye. - */ - public List getAllowedWearClass() - { - return _wearClass; - } - - /** - * @param classId the class trying to wear this dye. - * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. - */ - public boolean isAllowedClass(ClassId classId) - { - return _wearClass.contains(classId); - } - - /** - * @param wearClassIds the list of classes that can wear this dye. - */ - public void setWearClassIds(List wearClassIds) - { - _wearClass.addAll(wearClassIds); - } -} \ No newline at end of file diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java deleted file mode 100644 index a2897ba911..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import java.util.EnumMap; -import java.util.Map; - -import org.l2jmobius.gameserver.model.StatSet; - -/** - * @author UnAfraid - */ -public class CombinationItem -{ - private final int _itemOne; - private final int _itemTwo; - private final int _chance; - private final Map _rewards = new EnumMap<>(CombinationItemType.class); - - public CombinationItem(StatSet set) - { - _itemOne = set.getInt("one"); - _itemTwo = set.getInt("two"); - _chance = set.getInt("chance"); - } - - public int getItemOne() - { - return _itemOne; - } - - public int getItemTwo() - { - return _itemTwo; - } - - public int getChance() - { - return _chance; - } - - public void addReward(CombinationItemReward item) - { - _rewards.put(item.getType(), item); - } - - public CombinationItemReward getReward(CombinationItemType type) - { - return _rewards.get(type); - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java deleted file mode 100644 index 6745b1d5e4..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ /dev/null @@ -1,212 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.logging.Logger; - -import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public abstract class AbstractEnchantItem -{ - protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); - - private static final ItemType[] ENCHANT_TYPES = new ItemType[] - { - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - EtcItemType.BLESS_ENCHT_AM, - EtcItemType.BLESS_ENCHT_AM_DOWN, - EtcItemType.BLESS_ENCHT_WP, - EtcItemType.ENCHT_AM, - EtcItemType.ENCHT_WP, - EtcItemType.ENCHT_WP_DOWN, - EtcItemType.ENCHT_AM_DOWN, - EtcItemType.GIANT_ENCHT_AM, - EtcItemType.GIANT_ENCHT_WP, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - }; - - private final int _id; - private final CrystalType _grade; - private final int _minEnchantLevel; - private final int _maxEnchantLevel; - private final int _safeEnchantLevel; - private final int _randomEnchantMin; - private final int _randomEnchantMax; - private final double _bonusRate; - - public AbstractEnchantItem(StatSet set) - { - _id = set.getInt("id"); - if (getItem() == null) - { - throw new NullPointerException(); - } - else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) - { - throw new IllegalAccessError(); - } - _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); - _minEnchantLevel = set.getInt("minEnchant", 0); - _maxEnchantLevel = set.getInt("maxEnchant", 127); - _safeEnchantLevel = set.getInt("safeEnchant", 0); - _randomEnchantMin = set.getInt("randomEnchantMin", 1); - _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); - _bonusRate = set.getDouble("bonusRate", 0); - } - - /** - * @return id of current item - */ - public int getId() - { - return _id; - } - - /** - * @return bonus chance that would be added - */ - public double getBonusRate() - { - return _bonusRate; - } - - /** - * @return {@link ItemTemplate} current item/scroll - */ - public ItemTemplate getItem() - { - return ItemTable.getInstance().getTemplate(_id); - } - - /** - * @return grade of the item/scroll. - */ - public CrystalType getGrade() - { - return _grade; - } - - /** - * @return {@code true} if scroll is for weapon, {@code false} for armor - */ - public abstract boolean isWeapon(); - - /** - * @return the minimum enchant level that this scroll/item can be used with - */ - public int getMinEnchantLevel() - { - return _minEnchantLevel; - } - - /** - * @return the maximum enchant level that this scroll/item can be used with - */ - public int getMaxEnchantLevel() - { - return _maxEnchantLevel; - } - - /** - * @return the safe enchant level of this scroll/item - */ - public int getSafeEnchant() - { - return _safeEnchantLevel; - } - - /** - * @return the minimum random enchant level of this scroll/item - */ - public int getRandomEnchantMin() - { - return _randomEnchantMin; - } - - /** - * @return the maximum random enchant level of this scroll/item - */ - public int getRandomEnchantMax() - { - return _randomEnchantMax; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem - * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise - */ - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if (itemToEnchant == null) - { - return false; - } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) - { - return false; - } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) - { - return false; - } - else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) - { - return false; - } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) - { - return false; - } - return true; - } - - /** - * @param type2 - * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise - */ - private boolean isValidItemType(int type2) - { - if (type2 == ItemTemplate.TYPE2_WEAPON) - { - return isWeapon(); - } - else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) - { - return !isWeapon(); - } - return false; - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java deleted file mode 100644 index f543c70ebd..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.HashSet; -import java.util.Set; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.data.xml.EnchantItemData; -import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author UnAfraid - */ -public class EnchantScroll extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isBlessedDown; - private final boolean _isSafe; - private final boolean _isGiant; - private final int _scrollGroupId; - private Set _items; - - public EnchantScroll(StatSet set) - { - super(set); - _scrollGroupId = set.getInt("scrollGroupId", 0); - - final ItemType type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN); - _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - /** - * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will reset to 0), {@code false} otherwise - */ - public boolean isBlessed() - { - return _isBlessed; - } - - /** - * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise - */ - public boolean isBlessedDown() - { - return _isBlessedDown; - } - - /** - * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise - */ - public boolean isSafe() - { - return _isSafe; - } - - public boolean isGiant() - { - return _isGiant; - } - - /** - * @return id of scroll group that should be used - */ - public int getScrollGroupId() - { - return _scrollGroupId; - } - - /** - * Enforces current scroll to use only those items as possible items to enchant - * @param itemId - */ - public void addItem(int itemId) - { - if (_items == null) - { - _items = new HashSet<>(); - } - _items.add(itemId); - } - - public Set getItems() - { - return _items; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem the support item used when enchanting (can be null) - * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise - */ - @Override - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if ((_items != null) && !_items.contains(itemToEnchant.getId())) - { - return false; - } - else if ((supportItem != null)) - { - if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed())) - { - return false; - } - else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant())) - { - return false; - } - else if (!supportItem.isValid(itemToEnchant, supportItem)) - { - return false; - } - else if (supportItem.isWeapon() != isWeapon()) - { - return false; - } - } - if (_items == null) - { - for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls()) - { - if (scroll.getId() == getId()) - { - continue; - } - final Set scrollItems = scroll.getItems(); - if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId())) - { - return false; - } - } - } - return super.isValid(itemToEnchant, supportItem); - } - - /** - * @param player - * @param enchantItem - * @return the chance of current scroll's group. - */ - public double getChance(Player player, Item enchantItem) - { - if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); - return -1; - } - - final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); - if (group == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); - return -1; - } - - if ((getSafeEnchant() > 0) && (enchantItem.getEnchantLevel() < getSafeEnchant())) - { - return 100; - } - - return group.getChance(enchantItem.getEnchantLevel()); - } - - /** - * @param player - * @param enchantItem - * @param supportItem - * @return the total chance for success rate of this scroll - */ - public EnchantResultType calculateSuccess(Player player, Item enchantItem, EnchantSupportItem supportItem) - { - if (!isValid(enchantItem, supportItem)) - { - return EnchantResultType.ERROR; - } - - final double chance = getChance(player, enchantItem); - if (chance == -1) - { - return EnchantResultType.ERROR; - } - - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); - final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; - final double bonusRate = getBonusRate(); - final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; - final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100); - final double random = 100 * Rnd.nextDouble(); - final boolean success = (random < finalChance) || player.tryLuck(); - return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE; - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java deleted file mode 100644 index 12b33e468f..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public class EnchantSupportItem extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isDown; - private final boolean _isGiant; - private final ItemType type; - - public EnchantSupportItem(StatSet set) - { - super(set); - type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.ENCHT_WP_DOWN) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isDown = (type == EtcItemType.ENCHT_AM_DOWN) || (type == EtcItemType.ENCHT_WP_DOWN); - _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - public boolean isBlessed() - { - return _isBlessed; - } - - public boolean isDown() - { - return _isDown; - } - - public boolean isGiant() - { - return _isGiant; - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java deleted file mode 100644 index 5730665d9f..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * EtcItem Type enumerated. - */ -public enum EtcItemType implements ItemType -{ - NONE, - SCROLL, - ARROW, - POTION, - SPELLBOOK, - RECIPE, - MATERIAL, - PET_COLLAR, - CASTLE_GUARD, - DYE, - SEED, - SEED2, - HARVEST, - LOTTO, - RACE_TICKET, - TICKET_OF_LORD, - LURE, - CROP, - MATURECROP, - ENCHT_WP, - ENCHT_AM, - ENCHT_AM_DOWN, - ENCHT_WP_DOWN, - GIANT_ENCHT_WP, - GIANT_ENCHT_AM, - BLESS_ENCHT_WP, - BLESS_ENCHT_AM, - BLESS_ENCHT_AM_DOWN, - COUPON, - ELIXIR, - ENCHT_ATTR, - ENCHT_ATTR_CURSED, - BOLT, - ENCHT_ATTR_INC_PROP_ENCHT_WP, - ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_RUNE, - ENCHT_ATTRT_RUNE_SELECT, - TELEPORTBOOKMARK, - CHANGE_ATTR, - SOULSHOT, - SHAPE_SHIFTING_WP, - BLESS_SHAPE_SHIFTING_WP, - SHAPE_SHIFTING_WP_FIXED, - SHAPE_SHIFTING_AM, - BLESS_SHAPE_SHIFTING_AM, - SHAPE_SHIFTING_AM_FIXED, - SHAPE_SHIFTING_HAIRACC, - BLESS_SHAPE_SHIFTING_HAIRACC, - SHAPE_SHIFTING_HAIRACC_FIXED, - RESTORE_SHAPE_SHIFTING_WP, - RESTORE_SHAPE_SHIFTING_AM, - RESTORE_SHAPE_SHIFTING_HAIRACC, - RESTORE_SHAPE_SHIFTING_ALLITEM, - BLESS_INC_PROP_ENCHT_WP, - BLESS_INC_PROP_ENCHT_AM, - CARD_EVENT, - SHAPE_SHIFTING_ALLITEM_FIXED, - MULTI_ENCHT_WP, - MULTI_ENCHT_AM, - MULTI_INC_PROB_ENCHT_WP, - MULTI_INC_PROB_ENCHT_AM, - SOUL_CRYSTAL, - ENSOUL_STONE; - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return 0; - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 895461bfd7..aaab522d42 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index a43b3964d6..b98f055fe3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java index fd9165366d..20fbb1cd5f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -65,8 +65,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java index dde442a756..269f26165b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 1e3ef93f48..43da93ac47 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java index f6cdf4df7f..80b0c140b1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index da2c567d17..a99ddb2dfe 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 402c603dac..645156f9c1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ee53743fce..31df739b0f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index c37fedbfb8..068f5c9368 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index ef63d53ef4..0546560e58 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 3eda159a36..c524cb94f1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index ddbf6666c9..c4b2ee6602 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index 45301710ad..e9fb2b0c78 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index de0c583a95..59a7a0e0bb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index cfb6455ad0..31d29ef3dd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index bcaba26779..a91ba39468 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -42,8 +42,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 3c18ea36b6..5de6776c0e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -53,8 +53,8 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index dc02d363c8..ea86074f0e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index cb0801a8d5..f8d8826556 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index d6df3726cc..47214311ac 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 0d59d2ff65..e8d7efa6b0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1963944528..15841de161 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 2ca0f283f9..4f351a636b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 6cc03e2c2b..48cdb8e80b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 9dadd70240..d181f60d12 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 3cee24bfb0..161b8d0cab 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index ffd0ffbb36..67a4813cec 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java index 3d7c93c85c..c9b6d4dd3a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java @@ -22,8 +22,8 @@ import java.util.Set; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExTryEnchantArtifactResult; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 29f7828f27..a9fd8d923a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 12bc7c708d..79e1193ac0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 8a5f549b6f..5d9ff7b557 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 4759ba7fda..f511a8e30d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 1dca606dcd..36256ab955 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 1ee323a63c..7da966ce9f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 989d2e582f..2c715b4efb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d7fcffbdb5..4468b67642 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index fca793bdc0..776e7f818f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 95512364b3..bba86e4e86 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index cb16d5cc7d..cd8e900014 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index de4094b252..db5981de3d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 9bddf5f507..19a6780f98 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 61920f471b..f89be1cfcb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index ff361e97a4..1840fcded7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 17fa6aeaf2..f02aaa9ace 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index ca043af307..74f5736cf7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 940b213621..d9a7fcb4cb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 6800a418cc..d257cb06cc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AlchemyResult; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index f144094dda..95a85c269b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java index 1fc0400b59..eafc924a43 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.ActionDataHolder; import org.l2jmobius.gameserver.model.ShortCuts; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 80d2ecee11..e5c25df330 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index e7a8e8baf6..7fbd7ebecb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 03e1f539c4..ac6b8358d4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index e8f3c75825..912dae684a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 25c9792ec1..3220827fbb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index 0e95eb9b89..cdaefbe360 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51cd76618e..af8b12547e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 38bda2e6fb..e9cd6a88b8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 61fd93e55c..6063a54535 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index df2409c89e..0fc5fb1c75 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index 5a7a9c9c3b..a0ba15da9f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.holders.DamageTakenHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 12359bcd17..2cea176d69 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 93588924fe..077f33cb49 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 07725028a6..76375a86f7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c5c1d1141..81a384642c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index e4fb9e4160..b65005003d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 51abfa9d3e..f49138fafe 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 809a864983..395487097c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 2fe9967302..30dc837721 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 6691a8ea4f..cf3d83263f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 97b7b53cae..cb1379ac29 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index f826c75d4b..844fad86c7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index bd768c74e2..c4598a72e6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index a5616075a6..e1da19cc8f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ced39204d3..fbb5c84dfe 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4068629bde..d05590cbde 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 0e6211e63b..358ee2361b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index d48b66c6ef..9d9b24a54f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c742d534c4..c59568bf1d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index a22b36335e..35ca986d35 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 271ec4401b..37150ec357 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 6b8cd1358f..c32d4f7c04 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index ca4e7b7f5f..c1b8163a93 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 7553a3233e..fb0db44e8e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Guard; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/DocumentBase.java index 6d3154c313..030146cbdb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -135,9 +138,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index e525165bcb..38cb684c22 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/DragonWeaponListeners.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/DragonWeaponListeners.java index 09171d6d97..c50af03d70 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/DragonWeaponListeners.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/DragonWeaponListeners.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemEquip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java index e7cfdef238..adf66d2a8a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExGetPremiumItemList; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SiegeGuards.java index 07d6a45613..ea67a6b16c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 418ed93b2a..4081019df2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 5c3d6867a2..1e08a1f98d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index a53c69fb80..680745b29d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 5b1db54836..e7113941ec 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index f73f3c2e73..5d3caadfd5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 0a82f9968d..35d31315ad 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 707e9387d1..8ab335bc8b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 58e28495eb..042ba14139 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index ef698d3144..98c614b7e5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 59e5b148a1..76d08b7a2b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index e1681d19a4..8e1d2e4ebd 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index f7054e99e9..17d76b1bf6 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index 1d104a4069..bb6ed54b11 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index c5a58222c9..81749c89a6 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 19226dce0f..6cd820aedf 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index ab33e22a5f..adc092f771 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 31621251be..62d5debb32 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index fae553ff45..991d2217b5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java index 30151c2b58..69cedcca0c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusBirthInfo; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 7d0f0b43ba..9723633d69 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 437b502a95..b8985f0fef 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 277a03c294..c98e55ac10 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java index 2e2e322e86..6183d5637e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index bfc65e27f5..879983272a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index d592bba597..96b98f6548 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index aa2eabd231..5690696b29 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 705ed225aa..a74d84251f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index ebbd33bda0..f952b58fa2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Heal.java index d480511447..c69477f113 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index ecebff8fcf..bbe94f05d2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d55c2897df..a58e246a0d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java index 06f3fb2e45..4e0e25e56f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 8f81770a04..53f0529429 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index af19b2276d..ded8b9bcbc 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 7e60c89db5..2ca2c2fc70 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 6a58fbf31b..f4ff6be84c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java index 30b8b4d117..b5739976ad 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index c84a1eef1c..dc98162c19 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java index d43c368f7c..1d227df4d5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b485046a39..25c237e53f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 83860039e2..a22aaf477d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java index 0767b28991..6c95915b62 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index 5461a0259e..7b898d2461 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index d21bbf334e..ff11355aa7 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index ba621c653f..f553a0c846 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 9b16668969..119fe1f81e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 669c6bd362..604b134414 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index f45a96746c..7d8ad117db 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index e1384fe3e2..b527922050 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java index c835ed0702..7976256d7f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 4db0961a07..416fa8a65a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index c6d8ec7a1b..1f44066740 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 98ae8c4eaf..353347df87 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index ff9e654e61..3aeadd38a7 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index f40ab6c057..ab5ba58a10 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/CreatureAI.java index faa49497bf..3dd42f74db 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/ItemTable.java index 5fdb316882..439c38d1e5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -48,12 +48,12 @@ import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.AmmunitionSkillList; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index d508b71aef..fd2a491d66 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 0f8815bcc4..475f0085d8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index a213d965da..cab4dfa0e9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java index 426e9dd06f..6c261d6ded 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index cc0f4afb20..f7568ac960 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author Mobius diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 3f7c8ab166..02089dc8c1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/VariationData.java index 392612cd2d..c29a10baa2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index 1b5d73308d..4ed0600683 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/ItemGrade.java index ad9e39c36d..11ea4c3bd8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 557c5e108a..48a6f07b3c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index efa12b90bc..662dbf7c39 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index ce03808800..7799768d15 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ArmorSet.java index 9aa27bc064..14226149e5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CombatFlag.java index e726f912f1..e0487f9079 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CursedWeapon.java index d9dd1c9b65..2301aacbc4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Party.java index 12321a158f..1bd1eeb1cc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Party.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Seed.java index 13caeeb575..2dc7f967bb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java index d199976edc..a9fd529ecc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeList.java index bbafcb1416..bea714862c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0eca80504c..e3f680ef86 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -63,8 +63,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java index c60942df43..1402dccb4b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java index 573163b747..f7b00eb570 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java index 67538e89e7..64e2aa6e5d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -235,21 +235,21 @@ import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.homunculus.HomunculusList; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Summon.java index 4eb006b5f2..5c0f977ccc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 70166bae98..cdbe566796 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 4da5b23f77..02b8e77771 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index 3594c14845..5672633fc9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; public class PlayableStat extends CreatureStat diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index aae970603a..e296ba2cca 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SubClassHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index da03c6b165..d93e4def4d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 0190272650..df278a30d8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionMaximumVitalityPoints.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionMaximumVitalityPoints.java index 5e2d332711..f395f4581b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionMaximumVitalityPoints.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionMaximumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9c053efc5e..ebe8b7499f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 5b4ab6daf1..d68a40ee75 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 85c89d15ec..4c9bc6856c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 68990650dd..c08b648e55 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java index 58bd23cf07..5edfafb200 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index a5fea7c6f6..347f281026 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 2f1424657f..b5b9ac8025 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -132,15 +132,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java index f65fcabe54..e0317b1c0a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java index 780dbd83e4..51ec6c9e3d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java index 81e8c9eb16..bf1d1237f1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index af538045b8..d391a4faf1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 79c69f739d..41f554b9e0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index b86121305d..b18ff0fce9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java index d01b97cc2c..fcd3b7c0ba 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.model.TradeItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/Armor.java index d11c43f9cc..f65945c191 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/Henna.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/Henna.java new file mode 100644 index 0000000000..0d1de91388 --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -0,0 +1,183 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; + +/** + * Class for the Henna object. + * @author Zoey76 + */ +public class Henna +{ + private final int _dyeId; + private final int _dyeItemId; + private final boolean _isPremium; + private final Map _baseStats = new EnumMap<>(BaseStat.class); + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final int _duration; + private final List _skills; + private final List _wearClass; + + public Henna(StatSet set) + { + _dyeId = set.getInt("dyeId"); + _dyeItemId = set.getInt("dyeItemId"); + _isPremium = set.getBoolean("isPremium", false); + _baseStats.put(BaseStat.STR, set.getInt("str", 0)); + _baseStats.put(BaseStat.CON, set.getInt("con", 0)); + _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); + _baseStats.put(BaseStat.INT, set.getInt("int", 0)); + _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); + _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); + _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); + _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _duration = set.getInt("duration", -1); + _skills = new ArrayList<>(); + _wearClass = new ArrayList<>(); + } + + /** + * @return the dye Id. + */ + public int getDyeId() + { + return _dyeId; + } + + /** + * @return the item Id, required for this dye. + */ + public int getDyeItemId() + { + return _dyeItemId; + } + + /** + * @return true if this dye is premium. + */ + public boolean isPremium() + { + return _isPremium; + } + + public int getBaseStats(BaseStat stat) + { + return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); + } + + public Map getBaseStats() + { + return _baseStats; + } + + /** + * @return the wear fee, cost for adding this dye to the player. + */ + public int getWearFee() + { + return _wearFee; + } + + /** + * @return the wear count, the required count to add this dye to the player. + */ + public int getWearCount() + { + return _wearCount; + } + + /** + * @return the cancel fee, cost for removing this dye from the player. + */ + public int getCancelFee() + { + return _cancelFee; + } + + /** + * @return the cancel count, the retrieved amount of dye items after removing the dye. + */ + public int getCancelCount() + { + return _cancelCount; + } + + /** + * @return the duration of this dye. + */ + public int getDuration() + { + return _duration; + } + + /** + * @param skillList the list of skills related to this dye. + */ + public void setSkills(List skillList) + { + _skills.addAll(skillList); + } + + /** + * @return the skills related to this dye. + */ + public List getSkills() + { + return _skills; + } + + /** + * @return the list with the allowed classes to wear this dye. + */ + public List getAllowedWearClass() + { + return _wearClass; + } + + /** + * @param classId the class trying to wear this dye. + * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. + */ + public boolean isAllowedClass(ClassId classId) + { + return _wearClass.contains(classId); + } + + /** + * @param wearClassIds the list of classes that can wear this dye. + */ + public void setWearClassIds(List wearClassIds) + { + _wearClass.addAll(wearClassIds); + } +} \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index d58318fe05..4b205f2acf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java new file mode 100644 index 0000000000..b289fa70ae --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -0,0 +1,300 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.Collection; +import java.util.Objects; + +import org.l2jmobius.gameserver.enums.AttributeType; +import org.l2jmobius.gameserver.model.VariationInstance; +import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * This class contains Item
+ * Use to sort Item of : + *
    + *
  • Armor
    • + *
  • EtcItem
    • + *
  • Weapon
    • + *
+ * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ + */ +public class WarehouseItem +{ + private final ItemTemplate _item; + private final int _object; + private final long _count; + private final int _owner; + private final int _locationSlot; + private final int _enchant; + private final CrystalType _grade; + private final VariationInstance _augmentation; + private final int _customType1; + private final int _customType2; + private final int _mana; + + private byte _elemAtkType = -2; + private int _elemAtkPower = 0; + + private final int[] _elemDefAttr = + { + 0, + 0, + 0, + 0, + 0, + 0 + }; + + private final int[] _enchantOptions; + private final Collection _soulCrystalOptions; + private final Collection _soulCrystalSpecialOptions; + + private final int _time; + + public WarehouseItem(Item item) + { + Objects.requireNonNull(item); + _item = item.getItem(); + _object = item.getObjectId(); + _count = item.getCount(); + _owner = item.getOwnerId(); + _locationSlot = item.getLocationSlot(); + _enchant = item.getEnchantLevel(); + _customType1 = item.getCustomType1(); + _customType2 = item.getCustomType2(); + _grade = item.getItem().getCrystalType(); + _augmentation = item.getAugmentation(); + _mana = item.getMana(); + _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; + _elemAtkType = item.getAttackAttributeType().getClientId(); + _elemAtkPower = item.getAttackAttributePower(); + for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) + { + _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); + } + _enchantOptions = item.getEnchantOptions(); + _soulCrystalOptions = item.getSpecialAbilities(); + _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); + } + + /** + * @return the item. + */ + public ItemTemplate getItem() + { + return _item; + } + + /** + * @return the unique objectId. + */ + public int getObjectId() + { + return _object; + } + + /** + * @return the owner. + */ + public int getOwnerId() + { + return _owner; + } + + /** + * @return the location slot. + */ + public int getLocationSlot() + { + return _locationSlot; + } + + /** + * @return the count. + */ + public long getCount() + { + return _count; + } + + /** + * @return the first type. + */ + public int getType1() + { + return _item.getType1(); + } + + /** + * @return the second type. + */ + public int getType2() + { + return _item.getType2(); + } + + /** + * @return the second type. + */ + public ItemType getItemType() + { + return _item.getItemType(); + } + + /** + * @return the ItemId. + */ + public int getItemId() + { + return _item.getId(); + } + + /** + * @return the part of body used with this item. + */ + public long getBodyPart() + { + return _item.getBodyPart(); + } + + /** + * @return the enchant level. + */ + public int getEnchantLevel() + { + return _enchant; + } + + /** + * @return the item grade + */ + public CrystalType getItemGrade() + { + return _grade; + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + public boolean isWeapon() + { + return (_item instanceof Weapon); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise. + */ + public boolean isArmor() + { + return (_item instanceof Armor); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + public boolean isEtcItem() + { + return (_item instanceof EtcItem); + } + + /** + * @return the name of the item + */ + public String getItemName() + { + return _item.getName(); + } + + /** + * @return the augmentation If. + */ + public VariationInstance getAugmentation() + { + return _augmentation; + } + + /** + * @return the name of the item + */ + public String getName() + { + return _item.getName(); + } + + public int getCustomType1() + { + return _customType1; + } + + public int getCustomType2() + { + return _customType2; + } + + public int getMana() + { + return _mana; + } + + public byte getAttackElementType() + { + return _elemAtkType; + } + + public int getAttackElementPower() + { + return _elemAtkPower; + } + + public int getElementDefAttr(byte i) + { + return _elemDefAttr[i]; + } + + public int[] getEnchantOptions() + { + return _enchantOptions; + } + + public Collection getSoulCrystalOptions() + { + return _soulCrystalOptions; + } + + public Collection getSoulCrystalSpecialOptions() + { + return _soulCrystalSpecialOptions; + } + + public int getTime() + { + return _time; + } + + /** + * @return the name of the item + */ + @Override + public String toString() + { + return _item.toString(); + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/Weapon.java similarity index 94% rename from L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Weapon.java rename to L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/Weapon.java index 832169f5f1..4599d5047f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java new file mode 100644 index 0000000000..610e720125 --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -0,0 +1,558 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.network.SystemMessageId; + +/** + * @author UnAfraid + */ +public class AppearanceStone +{ + private final int _id; + private final int _cost; + private final int _visualId; + private final long _lifeTime; + private final AppearanceType _type; + private final WeaponType _weaponType; + private final ArmorType _armorType; + private final AppearanceHandType _handType; + private final AppearanceMagicType _magicType; + private List _crystalTypes; + private List _targetTypes; + private List _bodyParts; + private List _races; + private List _racesNot; + private List _allVisualIds; + + public AppearanceStone(StatSet set) + { + _id = set.getInt("id"); + _visualId = set.getInt("visualId", 0); + _cost = set.getInt("cost", 0); + _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); + _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); + _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); + _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); + _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); + _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); + + final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); + if (targetType != AppearanceTargetType.NONE) + { + addTargetType(targetType); + } + + // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. + final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); + + // If no crystal type is defined, we must add all defaults. + if (crystalType == null) + { + switch (targetType) + { + case ACCESSORY: + case ALL: + { + addCrystalType(CrystalType.NONE); + // fallthrough + } + case WEAPON: + case ARMOR: + { + for (CrystalType cryType : CrystalType.values()) + { + if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) + { + addCrystalType(cryType); + } + } + } + } + } + else + { + addCrystalType(crystalType); + } + + final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); + if (bodyPart != ItemTemplate.SLOT_NONE) + { + addBodyPart(bodyPart); + } + + final Race race = set.getEnum("race", Race.class, Race.NONE); + if (race != Race.NONE) + { + addRace(race); + } + + final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); + if (raceNot != Race.NONE) + { + addRaceNot(raceNot); + } + } + + public int getId() + { + return _id; + } + + public int getVisualId() + { + return _visualId; + } + + public int getCost() + { + return _cost; + } + + public long getLifeTime() + { + return _lifeTime; + } + + public AppearanceType getType() + { + return _type; + } + + public WeaponType getWeaponType() + { + return _weaponType; + } + + public ArmorType getArmorType() + { + return _armorType; + } + + public AppearanceHandType getHandType() + { + return _handType; + } + + public AppearanceMagicType getMagicType() + { + return _magicType; + } + + public void addCrystalType(CrystalType type) + { + if (_crystalTypes == null) + { + _crystalTypes = new ArrayList<>(); + } + _crystalTypes.add(type); + } + + public List getCrystalTypes() + { + return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); + } + + public void addTargetType(AppearanceTargetType type) + { + if (_targetTypes == null) + { + _targetTypes = new ArrayList<>(); + } + _targetTypes.add(type); + } + + public List getTargetTypes() + { + return _targetTypes != null ? _targetTypes : Collections.emptyList(); + } + + public void addBodyPart(long part) + { + if (_bodyParts == null) + { + _bodyParts = new ArrayList<>(); + } + _bodyParts.add(part); + } + + public void addVisualId(AppearanceHolder appearanceHolder) + { + if (_allVisualIds == null) + { + _allVisualIds = new ArrayList<>(); + } + _allVisualIds.add(appearanceHolder); + } + + public List getVisualIds() + { + return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); + } + + public List getBodyParts() + { + return _bodyParts != null ? _bodyParts : Collections.emptyList(); + } + + public void addRace(Race race) + { + if (_races == null) + { + _races = new ArrayList<>(); + } + _races.add(race); + } + + public List getRaces() + { + return _races != null ? _races : Collections.emptyList(); + } + + public void addRaceNot(Race race) + { + if (_racesNot == null) + { + _racesNot = new ArrayList<>(); + } + _racesNot.add(race); + } + + public List getRacesNot() + { + return _racesNot != null ? _racesNot : Collections.emptyList(); + } + + /** + * @param player the actor requesting to use this appearance. + * @param targetItem the item to be modified with this appearance. + * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. + */ + public boolean checkConditions(Player player, Item targetItem) + { + if (targetItem == null) + { + return false; + } + + if (getTargetTypes().isEmpty()) + { + return false; + } + + if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); + return false; + } + + switch (_type) + { + case RESTORE: + { + if (targetItem.getVisualId() == 0) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); + return false; + } + + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + default: + { + // Seems like in retail item with already changed appearance, can be changed again without being restored. + + final AppearanceTargetType targetType = getTargetTypes().get(0); + switch (targetType) + { + case NONE: + { + return false; + } + case WEAPON: + { + if (!targetItem.isWeapon()) + { + player.sendPacket(SystemMessageId.WEAPONS_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ARMOR: + { + if (!targetItem.isArmor()) + { + player.sendPacket(SystemMessageId.ARMOR_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ACCESSORY: + { + if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + { + player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); + return false; + } + break; + } + case ALL: + { + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (findVisualChange(targetItem) == null) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + return true; + } + } + break; + } + } + + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (_weaponType != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) + { + if (_weaponType != WeaponType.CROSSBOW) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + } + + switch (_handType) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + } + + switch (_magicType) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + if (_armorType != ArmorType.NONE) + { + switch (_armorType) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + return true; + } + + public AppearanceHolder findVisualChange(Item targetItem) + { + for (AppearanceHolder holder : _allVisualIds) + { + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + { + continue; + } + + if (holder.getWeaponType() != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) + { + if (holder.getWeaponType() != WeaponType.CROSSBOW) + { + continue; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + continue; + } + } + + switch (holder.getHandType()) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + continue; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + continue; + } + break; + } + } + + switch (holder.getMagicType()) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + continue; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + continue; + } + } + } + } + + if (holder.getArmorType() != ArmorType.NONE) + { + switch (holder.getArmorType()) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + continue; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + continue; + } + } + } + } + return holder; + } + return null; + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java new file mode 100644 index 0000000000..6f73983c0e --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -0,0 +1,65 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import java.util.EnumMap; +import java.util.Map; + +import org.l2jmobius.gameserver.model.StatSet; + +/** + * @author UnAfraid + */ +public class CombinationItem +{ + private final int _itemOne; + private final int _itemTwo; + private final int _chance; + private final Map _rewards = new EnumMap<>(CombinationItemType.class); + + public CombinationItem(StatSet set) + { + _itemOne = set.getInt("one"); + _itemTwo = set.getInt("two"); + _chance = set.getInt("chance"); + } + + public int getItemOne() + { + return _itemOne; + } + + public int getItemTwo() + { + return _itemTwo; + } + + public int getChance() + { + return _chance; + } + + public void addReward(CombinationItemReward item) + { + _rewards.put(item.getType(), item); + } + + public CombinationItemReward getReward(CombinationItemType type) + { + return _rewards.get(type); + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java new file mode 100644 index 0000000000..76176d2ab3 --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -0,0 +1,212 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.logging.Logger; + +import org.l2jmobius.commons.util.CommonUtil; +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public abstract class AbstractEnchantItem +{ + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); + + private static final ItemType[] ENCHANT_TYPES = new ItemType[] + { + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + EtcItemType.BLESS_ENCHT_AM, + EtcItemType.BLESS_ENCHT_AM_DOWN, + EtcItemType.BLESS_ENCHT_WP, + EtcItemType.ENCHT_AM, + EtcItemType.ENCHT_WP, + EtcItemType.ENCHT_WP_DOWN, + EtcItemType.ENCHT_AM_DOWN, + EtcItemType.GIANT_ENCHT_AM, + EtcItemType.GIANT_ENCHT_WP, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + }; + + private final int _id; + private final CrystalType _grade; + private final int _minEnchantLevel; + private final int _maxEnchantLevel; + private final int _safeEnchantLevel; + private final int _randomEnchantMin; + private final int _randomEnchantMax; + private final double _bonusRate; + + public AbstractEnchantItem(StatSet set) + { + _id = set.getInt("id"); + if (getItem() == null) + { + throw new NullPointerException(); + } + else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) + { + throw new IllegalAccessError(); + } + _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); + _minEnchantLevel = set.getInt("minEnchant", 0); + _maxEnchantLevel = set.getInt("maxEnchant", 127); + _safeEnchantLevel = set.getInt("safeEnchant", 0); + _randomEnchantMin = set.getInt("randomEnchantMin", 1); + _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); + _bonusRate = set.getDouble("bonusRate", 0); + } + + /** + * @return id of current item + */ + public int getId() + { + return _id; + } + + /** + * @return bonus chance that would be added + */ + public double getBonusRate() + { + return _bonusRate; + } + + /** + * @return {@link ItemTemplate} current item/scroll + */ + public ItemTemplate getItem() + { + return ItemTable.getInstance().getTemplate(_id); + } + + /** + * @return grade of the item/scroll. + */ + public CrystalType getGrade() + { + return _grade; + } + + /** + * @return {@code true} if scroll is for weapon, {@code false} for armor + */ + public abstract boolean isWeapon(); + + /** + * @return the minimum enchant level that this scroll/item can be used with + */ + public int getMinEnchantLevel() + { + return _minEnchantLevel; + } + + /** + * @return the maximum enchant level that this scroll/item can be used with + */ + public int getMaxEnchantLevel() + { + return _maxEnchantLevel; + } + + /** + * @return the safe enchant level of this scroll/item + */ + public int getSafeEnchant() + { + return _safeEnchantLevel; + } + + /** + * @return the minimum random enchant level of this scroll/item + */ + public int getRandomEnchantMin() + { + return _randomEnchantMin; + } + + /** + * @return the maximum random enchant level of this scroll/item + */ + public int getRandomEnchantMax() + { + return _randomEnchantMax; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem + * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise + */ + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if (itemToEnchant == null) + { + return false; + } + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + { + return false; + } + else if (!isValidItemType(itemToEnchant.getItem().getType2())) + { + return false; + } + else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) + { + return false; + } + else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + { + return false; + } + return true; + } + + /** + * @param type2 + * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise + */ + private boolean isValidItemType(int type2) + { + if (type2 == ItemTemplate.TYPE2_WEAPON) + { + return isWeapon(); + } + else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) + { + return !isWeapon(); + } + return false; + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..1099b77054 --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private long _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(long slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java new file mode 100644 index 0000000000..ea29d773db --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -0,0 +1,225 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.HashSet; +import java.util.Set; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.data.xml.EnchantItemData; +import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author UnAfraid + */ +public class EnchantScroll extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isBlessedDown; + private final boolean _isSafe; + private final boolean _isGiant; + private final int _scrollGroupId; + private Set _items; + + public EnchantScroll(StatSet set) + { + super(set); + _scrollGroupId = set.getInt("scrollGroupId", 0); + + final ItemType type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN); + _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + /** + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will reset to 0), {@code false} otherwise + */ + public boolean isBlessed() + { + return _isBlessed; + } + + /** + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise + */ + public boolean isBlessedDown() + { + return _isBlessedDown; + } + + /** + * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise + */ + public boolean isSafe() + { + return _isSafe; + } + + public boolean isGiant() + { + return _isGiant; + } + + /** + * @return id of scroll group that should be used + */ + public int getScrollGroupId() + { + return _scrollGroupId; + } + + /** + * Enforces current scroll to use only those items as possible items to enchant + * @param itemId + */ + public void addItem(int itemId) + { + if (_items == null) + { + _items = new HashSet<>(); + } + _items.add(itemId); + } + + public Set getItems() + { + return _items; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem the support item used when enchanting (can be null) + * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise + */ + @Override + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if ((_items != null) && !_items.contains(itemToEnchant.getId())) + { + return false; + } + else if ((supportItem != null)) + { + if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed())) + { + return false; + } + else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant())) + { + return false; + } + else if (!supportItem.isValid(itemToEnchant, supportItem)) + { + return false; + } + else if (supportItem.isWeapon() != isWeapon()) + { + return false; + } + } + if (_items == null) + { + for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls()) + { + if (scroll.getId() == getId()) + { + continue; + } + final Set scrollItems = scroll.getItems(); + if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId())) + { + return false; + } + } + } + return super.isValid(itemToEnchant, supportItem); + } + + /** + * @param player + * @param enchantItem + * @return the chance of current scroll's group. + */ + public double getChance(Player player, Item enchantItem) + { + if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) + { + LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); + return -1; + } + + final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); + if (group == null) + { + LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); + return -1; + } + + if ((getSafeEnchant() > 0) && (enchantItem.getEnchantLevel() < getSafeEnchant())) + { + return 100; + } + + return group.getChance(enchantItem.getEnchantLevel()); + } + + /** + * @param player + * @param enchantItem + * @param supportItem + * @return the total chance for success rate of this scroll + */ + public EnchantResultType calculateSuccess(Player player, Item enchantItem, EnchantSupportItem supportItem) + { + if (!isValid(enchantItem, supportItem)) + { + return EnchantResultType.ERROR; + } + + final double chance = getChance(player, enchantItem); + if (chance == -1) + { + return EnchantResultType.ERROR; + } + + final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; + final double bonusRate = getBonusRate(); + final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; + final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100); + final double random = 100 * Rnd.nextDouble(); + final boolean success = (random < finalChance) || player.tryLuck(); + return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE; + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java new file mode 100644 index 0000000000..308f08c38b --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -0,0 +1,64 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public class EnchantSupportItem extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isDown; + private final boolean _isGiant; + private final ItemType type; + + public EnchantSupportItem(StatSet set) + { + super(set); + type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.ENCHT_WP_DOWN) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isDown = (type == EtcItemType.ENCHT_AM_DOWN) || (type == EtcItemType.ENCHT_WP_DOWN); + _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + public boolean isBlessed() + { + return _isBlessed; + } + + public boolean isDown() + { + return _isDown; + } + + public boolean isGiant() + { + return _isGiant; + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java index e0c5dc5b59..bd90178552 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -75,15 +75,15 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java similarity index 94% rename from L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java rename to L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java index 2920bda8fa..d325c3ffa9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Crystal Type enumerated. diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java new file mode 100644 index 0000000000..c9c153923e --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -0,0 +1,106 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * EtcItem Type enumerated. + */ +public enum EtcItemType implements ItemType +{ + NONE, + SCROLL, + ARROW, + POTION, + SPELLBOOK, + RECIPE, + MATERIAL, + PET_COLLAR, + CASTLE_GUARD, + DYE, + SEED, + SEED2, + HARVEST, + LOTTO, + RACE_TICKET, + TICKET_OF_LORD, + LURE, + CROP, + MATURECROP, + ENCHT_WP, + ENCHT_AM, + ENCHT_AM_DOWN, + ENCHT_WP_DOWN, + GIANT_ENCHT_WP, + GIANT_ENCHT_AM, + BLESS_ENCHT_WP, + BLESS_ENCHT_AM, + BLESS_ENCHT_AM_DOWN, + COUPON, + ELIXIR, + ENCHT_ATTR, + ENCHT_ATTR_CURSED, + BOLT, + ENCHT_ATTR_INC_PROP_ENCHT_WP, + ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_RUNE, + ENCHT_ATTRT_RUNE_SELECT, + TELEPORTBOOKMARK, + CHANGE_ATTR, + SOULSHOT, + SHAPE_SHIFTING_WP, + BLESS_SHAPE_SHIFTING_WP, + SHAPE_SHIFTING_WP_FIXED, + SHAPE_SHIFTING_AM, + BLESS_SHAPE_SHIFTING_AM, + SHAPE_SHIFTING_AM_FIXED, + SHAPE_SHIFTING_HAIRACC, + BLESS_SHAPE_SHIFTING_HAIRACC, + SHAPE_SHIFTING_HAIRACC_FIXED, + RESTORE_SHAPE_SHIFTING_WP, + RESTORE_SHAPE_SHIFTING_AM, + RESTORE_SHAPE_SHIFTING_HAIRACC, + RESTORE_SHAPE_SHIFTING_ALLITEM, + BLESS_INC_PROP_ENCHT_WP, + BLESS_INC_PROP_ENCHT_AM, + CARD_EVENT, + SHAPE_SHIFTING_ALLITEM_FIXED, + MULTI_ENCHT_WP, + MULTI_ENCHT_AM, + MULTI_INC_PROB_ENCHT_WP, + MULTI_INC_PROB_ENCHT_AM, + SOUL_CRYSTAL, + ENSOUL_STONE; + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return 0; + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 8323d4bdc7..06760564d7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index a4e29d4a78..19e7395abf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -54,13 +54,13 @@ import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 9f50c399b6..aec33c3013 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,10 +40,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Henna.java deleted file mode 100644 index 426a12682a..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/Henna.java +++ /dev/null @@ -1,183 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; - -import org.l2jmobius.gameserver.enums.ClassId; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; - -/** - * Class for the Henna object. - * @author Zoey76 - */ -public class Henna -{ - private final int _dyeId; - private final int _dyeItemId; - private final boolean _isPremium; - private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wearFee; - private final int _wearCount; - private final int _cancelFee; - private final int _cancelCount; - private final int _duration; - private final List _skills; - private final List _wearClass; - - public Henna(StatSet set) - { - _dyeId = set.getInt("dyeId"); - _dyeItemId = set.getInt("dyeItemId"); - _isPremium = set.getBoolean("isPremium", false); - _baseStats.put(BaseStat.STR, set.getInt("str", 0)); - _baseStats.put(BaseStat.CON, set.getInt("con", 0)); - _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); - _baseStats.put(BaseStat.INT, set.getInt("int", 0)); - _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); - _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); - _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wearFee = set.getInt("wear_fee"); - _wearCount = set.getInt("wear_count"); - _cancelFee = set.getInt("cancel_fee"); - _cancelCount = set.getInt("cancel_count"); - _duration = set.getInt("duration", -1); - _skills = new ArrayList<>(); - _wearClass = new ArrayList<>(); - } - - /** - * @return the dye Id. - */ - public int getDyeId() - { - return _dyeId; - } - - /** - * @return the item Id, required for this dye. - */ - public int getDyeItemId() - { - return _dyeItemId; - } - - /** - * @return true if this dye is premium. - */ - public boolean isPremium() - { - return _isPremium; - } - - public int getBaseStats(BaseStat stat) - { - return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); - } - - public Map getBaseStats() - { - return _baseStats; - } - - /** - * @return the wear fee, cost for adding this dye to the player. - */ - public int getWearFee() - { - return _wearFee; - } - - /** - * @return the wear count, the required count to add this dye to the player. - */ - public int getWearCount() - { - return _wearCount; - } - - /** - * @return the cancel fee, cost for removing this dye from the player. - */ - public int getCancelFee() - { - return _cancelFee; - } - - /** - * @return the cancel count, the retrieved amount of dye items after removing the dye. - */ - public int getCancelCount() - { - return _cancelCount; - } - - /** - * @return the duration of this dye. - */ - public int getDuration() - { - return _duration; - } - - /** - * @param skillList the list of skills related to this dye. - */ - public void setSkills(List skillList) - { - _skills.addAll(skillList); - } - - /** - * @return the skills related to this dye. - */ - public List getSkills() - { - return _skills; - } - - /** - * @return the list with the allowed classes to wear this dye. - */ - public List getAllowedWearClass() - { - return _wearClass; - } - - /** - * @param classId the class trying to wear this dye. - * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. - */ - public boolean isAllowedClass(ClassId classId) - { - return _wearClass.contains(classId); - } - - /** - * @param wearClassIds the list of classes that can wear this dye. - */ - public void setWearClassIds(List wearClassIds) - { - _wearClass.addAll(wearClassIds); - } -} \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java deleted file mode 100644 index 5618132356..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ /dev/null @@ -1,300 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.Collection; -import java.util.Objects; - -import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * This class contains Item
- * Use to sort Item of : - *
    - *
  • Armor
    • - *
  • EtcItem
    • - *
  • Weapon
    • - *
- * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ - */ -public class WarehouseItem -{ - private final ItemTemplate _item; - private final int _object; - private final long _count; - private final int _owner; - private final int _locationSlot; - private final int _enchant; - private final CrystalType _grade; - private final VariationInstance _augmentation; - private final int _customType1; - private final int _customType2; - private final int _mana; - - private byte _elemAtkType = -2; - private int _elemAtkPower = 0; - - private final int[] _elemDefAttr = - { - 0, - 0, - 0, - 0, - 0, - 0 - }; - - private final int[] _enchantOptions; - private final Collection _soulCrystalOptions; - private final Collection _soulCrystalSpecialOptions; - - private final int _time; - - public WarehouseItem(Item item) - { - Objects.requireNonNull(item); - _item = item.getItem(); - _object = item.getObjectId(); - _count = item.getCount(); - _owner = item.getOwnerId(); - _locationSlot = item.getLocationSlot(); - _enchant = item.getEnchantLevel(); - _customType1 = item.getCustomType1(); - _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); - _augmentation = item.getAugmentation(); - _mana = item.getMana(); - _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; - _elemAtkType = item.getAttackAttributeType().getClientId(); - _elemAtkPower = item.getAttackAttributePower(); - for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) - { - _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); - } - _enchantOptions = item.getEnchantOptions(); - _soulCrystalOptions = item.getSpecialAbilities(); - _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); - } - - /** - * @return the item. - */ - public ItemTemplate getItem() - { - return _item; - } - - /** - * @return the unique objectId. - */ - public int getObjectId() - { - return _object; - } - - /** - * @return the owner. - */ - public int getOwnerId() - { - return _owner; - } - - /** - * @return the location slot. - */ - public int getLocationSlot() - { - return _locationSlot; - } - - /** - * @return the count. - */ - public long getCount() - { - return _count; - } - - /** - * @return the first type. - */ - public int getType1() - { - return _item.getType1(); - } - - /** - * @return the second type. - */ - public int getType2() - { - return _item.getType2(); - } - - /** - * @return the second type. - */ - public ItemType getItemType() - { - return _item.getItemType(); - } - - /** - * @return the ItemId. - */ - public int getItemId() - { - return _item.getId(); - } - - /** - * @return the part of body used with this item. - */ - public long getBodyPart() - { - return _item.getBodyPart(); - } - - /** - * @return the enchant level. - */ - public int getEnchantLevel() - { - return _enchant; - } - - /** - * @return the item grade - */ - public CrystalType getItemGrade() - { - return _grade; - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - public boolean isWeapon() - { - return (_item instanceof Weapon); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise. - */ - public boolean isArmor() - { - return (_item instanceof Armor); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - public boolean isEtcItem() - { - return (_item instanceof EtcItem); - } - - /** - * @return the name of the item - */ - public String getItemName() - { - return _item.getName(); - } - - /** - * @return the augmentation If. - */ - public VariationInstance getAugmentation() - { - return _augmentation; - } - - /** - * @return the name of the item - */ - public String getName() - { - return _item.getName(); - } - - public int getCustomType1() - { - return _customType1; - } - - public int getCustomType2() - { - return _customType2; - } - - public int getMana() - { - return _mana; - } - - public byte getAttackElementType() - { - return _elemAtkType; - } - - public int getAttackElementPower() - { - return _elemAtkPower; - } - - public int getElementDefAttr(byte i) - { - return _elemDefAttr[i]; - } - - public int[] getEnchantOptions() - { - return _enchantOptions; - } - - public Collection getSoulCrystalOptions() - { - return _soulCrystalOptions; - } - - public Collection getSoulCrystalSpecialOptions() - { - return _soulCrystalSpecialOptions; - } - - public int getTime() - { - return _time; - } - - /** - * @return the name of the item - */ - @Override - public String toString() - { - return _item.toString(); - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java deleted file mode 100644 index a568389489..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ /dev/null @@ -1,558 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author UnAfraid - */ -public class AppearanceStone -{ - private final int _id; - private final int _cost; - private final int _visualId; - private final long _lifeTime; - private final AppearanceType _type; - private final WeaponType _weaponType; - private final ArmorType _armorType; - private final AppearanceHandType _handType; - private final AppearanceMagicType _magicType; - private List _crystalTypes; - private List _targetTypes; - private List _bodyParts; - private List _races; - private List _racesNot; - private List _allVisualIds; - - public AppearanceStone(StatSet set) - { - _id = set.getInt("id"); - _visualId = set.getInt("visualId", 0); - _cost = set.getInt("cost", 0); - _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); - _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); - _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); - _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); - _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); - _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); - - final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); - if (targetType != AppearanceTargetType.NONE) - { - addTargetType(targetType); - } - - // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. - final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); - - // If no crystal type is defined, we must add all defaults. - if (crystalType == null) - { - switch (targetType) - { - case ACCESSORY: - case ALL: - { - addCrystalType(CrystalType.NONE); - // fallthrough - } - case WEAPON: - case ARMOR: - { - for (CrystalType cryType : CrystalType.values()) - { - if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) - { - addCrystalType(cryType); - } - } - } - } - } - else - { - addCrystalType(crystalType); - } - - final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); - if (bodyPart != ItemTemplate.SLOT_NONE) - { - addBodyPart(bodyPart); - } - - final Race race = set.getEnum("race", Race.class, Race.NONE); - if (race != Race.NONE) - { - addRace(race); - } - - final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); - if (raceNot != Race.NONE) - { - addRaceNot(raceNot); - } - } - - public int getId() - { - return _id; - } - - public int getVisualId() - { - return _visualId; - } - - public int getCost() - { - return _cost; - } - - public long getLifeTime() - { - return _lifeTime; - } - - public AppearanceType getType() - { - return _type; - } - - public WeaponType getWeaponType() - { - return _weaponType; - } - - public ArmorType getArmorType() - { - return _armorType; - } - - public AppearanceHandType getHandType() - { - return _handType; - } - - public AppearanceMagicType getMagicType() - { - return _magicType; - } - - public void addCrystalType(CrystalType type) - { - if (_crystalTypes == null) - { - _crystalTypes = new ArrayList<>(); - } - _crystalTypes.add(type); - } - - public List getCrystalTypes() - { - return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); - } - - public void addTargetType(AppearanceTargetType type) - { - if (_targetTypes == null) - { - _targetTypes = new ArrayList<>(); - } - _targetTypes.add(type); - } - - public List getTargetTypes() - { - return _targetTypes != null ? _targetTypes : Collections.emptyList(); - } - - public void addBodyPart(long part) - { - if (_bodyParts == null) - { - _bodyParts = new ArrayList<>(); - } - _bodyParts.add(part); - } - - public void addVisualId(AppearanceHolder appearanceHolder) - { - if (_allVisualIds == null) - { - _allVisualIds = new ArrayList<>(); - } - _allVisualIds.add(appearanceHolder); - } - - public List getVisualIds() - { - return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); - } - - public List getBodyParts() - { - return _bodyParts != null ? _bodyParts : Collections.emptyList(); - } - - public void addRace(Race race) - { - if (_races == null) - { - _races = new ArrayList<>(); - } - _races.add(race); - } - - public List getRaces() - { - return _races != null ? _races : Collections.emptyList(); - } - - public void addRaceNot(Race race) - { - if (_racesNot == null) - { - _racesNot = new ArrayList<>(); - } - _racesNot.add(race); - } - - public List getRacesNot() - { - return _racesNot != null ? _racesNot : Collections.emptyList(); - } - - /** - * @param player the actor requesting to use this appearance. - * @param targetItem the item to be modified with this appearance. - * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. - */ - public boolean checkConditions(Player player, Item targetItem) - { - if (targetItem == null) - { - return false; - } - - if (getTargetTypes().isEmpty()) - { - return false; - } - - if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); - return false; - } - - switch (_type) - { - case RESTORE: - { - if (targetItem.getVisualId() == 0) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); - return false; - } - - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - default: - { - // Seems like in retail item with already changed appearance, can be changed again without being restored. - - final AppearanceTargetType targetType = getTargetTypes().get(0); - switch (targetType) - { - case NONE: - { - return false; - } - case WEAPON: - { - if (!targetItem.isWeapon()) - { - player.sendPacket(SystemMessageId.WEAPONS_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ARMOR: - { - if (!targetItem.isArmor()) - { - player.sendPacket(SystemMessageId.ARMOR_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ACCESSORY: - { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) - { - player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); - return false; - } - break; - } - case ALL: - { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (findVisualChange(targetItem) == null) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - return true; - } - } - break; - } - } - - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (_weaponType != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) - { - if (_weaponType != WeaponType.CROSSBOW) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - } - - switch (_handType) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - } - - switch (_magicType) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - if (_armorType != ArmorType.NONE) - { - switch (_armorType) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - return true; - } - - public AppearanceHolder findVisualChange(Item targetItem) - { - for (AppearanceHolder holder : _allVisualIds) - { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) - { - continue; - } - - if (holder.getWeaponType() != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) - { - if (holder.getWeaponType() != WeaponType.CROSSBOW) - { - continue; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - continue; - } - } - - switch (holder.getHandType()) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - continue; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - continue; - } - break; - } - } - - switch (holder.getMagicType()) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - continue; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - continue; - } - } - } - } - - if (holder.getArmorType() != ArmorType.NONE) - { - switch (holder.getArmorType()) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - continue; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - continue; - } - } - } - } - return holder; - } - return null; - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java deleted file mode 100644 index a2897ba911..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import java.util.EnumMap; -import java.util.Map; - -import org.l2jmobius.gameserver.model.StatSet; - -/** - * @author UnAfraid - */ -public class CombinationItem -{ - private final int _itemOne; - private final int _itemTwo; - private final int _chance; - private final Map _rewards = new EnumMap<>(CombinationItemType.class); - - public CombinationItem(StatSet set) - { - _itemOne = set.getInt("one"); - _itemTwo = set.getInt("two"); - _chance = set.getInt("chance"); - } - - public int getItemOne() - { - return _itemOne; - } - - public int getItemTwo() - { - return _itemTwo; - } - - public int getChance() - { - return _chance; - } - - public void addReward(CombinationItemReward item) - { - _rewards.put(item.getType(), item); - } - - public CombinationItemReward getReward(CombinationItemType type) - { - return _rewards.get(type); - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java deleted file mode 100644 index 6745b1d5e4..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ /dev/null @@ -1,212 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.logging.Logger; - -import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public abstract class AbstractEnchantItem -{ - protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); - - private static final ItemType[] ENCHANT_TYPES = new ItemType[] - { - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - EtcItemType.BLESS_ENCHT_AM, - EtcItemType.BLESS_ENCHT_AM_DOWN, - EtcItemType.BLESS_ENCHT_WP, - EtcItemType.ENCHT_AM, - EtcItemType.ENCHT_WP, - EtcItemType.ENCHT_WP_DOWN, - EtcItemType.ENCHT_AM_DOWN, - EtcItemType.GIANT_ENCHT_AM, - EtcItemType.GIANT_ENCHT_WP, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - }; - - private final int _id; - private final CrystalType _grade; - private final int _minEnchantLevel; - private final int _maxEnchantLevel; - private final int _safeEnchantLevel; - private final int _randomEnchantMin; - private final int _randomEnchantMax; - private final double _bonusRate; - - public AbstractEnchantItem(StatSet set) - { - _id = set.getInt("id"); - if (getItem() == null) - { - throw new NullPointerException(); - } - else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) - { - throw new IllegalAccessError(); - } - _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); - _minEnchantLevel = set.getInt("minEnchant", 0); - _maxEnchantLevel = set.getInt("maxEnchant", 127); - _safeEnchantLevel = set.getInt("safeEnchant", 0); - _randomEnchantMin = set.getInt("randomEnchantMin", 1); - _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); - _bonusRate = set.getDouble("bonusRate", 0); - } - - /** - * @return id of current item - */ - public int getId() - { - return _id; - } - - /** - * @return bonus chance that would be added - */ - public double getBonusRate() - { - return _bonusRate; - } - - /** - * @return {@link ItemTemplate} current item/scroll - */ - public ItemTemplate getItem() - { - return ItemTable.getInstance().getTemplate(_id); - } - - /** - * @return grade of the item/scroll. - */ - public CrystalType getGrade() - { - return _grade; - } - - /** - * @return {@code true} if scroll is for weapon, {@code false} for armor - */ - public abstract boolean isWeapon(); - - /** - * @return the minimum enchant level that this scroll/item can be used with - */ - public int getMinEnchantLevel() - { - return _minEnchantLevel; - } - - /** - * @return the maximum enchant level that this scroll/item can be used with - */ - public int getMaxEnchantLevel() - { - return _maxEnchantLevel; - } - - /** - * @return the safe enchant level of this scroll/item - */ - public int getSafeEnchant() - { - return _safeEnchantLevel; - } - - /** - * @return the minimum random enchant level of this scroll/item - */ - public int getRandomEnchantMin() - { - return _randomEnchantMin; - } - - /** - * @return the maximum random enchant level of this scroll/item - */ - public int getRandomEnchantMax() - { - return _randomEnchantMax; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem - * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise - */ - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if (itemToEnchant == null) - { - return false; - } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) - { - return false; - } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) - { - return false; - } - else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) - { - return false; - } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) - { - return false; - } - return true; - } - - /** - * @param type2 - * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise - */ - private boolean isValidItemType(int type2) - { - if (type2 == ItemTemplate.TYPE2_WEAPON) - { - return isWeapon(); - } - else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) - { - return !isWeapon(); - } - return false; - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fe698d8e2a..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private long _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(long slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java deleted file mode 100644 index f543c70ebd..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.HashSet; -import java.util.Set; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.data.xml.EnchantItemData; -import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author UnAfraid - */ -public class EnchantScroll extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isBlessedDown; - private final boolean _isSafe; - private final boolean _isGiant; - private final int _scrollGroupId; - private Set _items; - - public EnchantScroll(StatSet set) - { - super(set); - _scrollGroupId = set.getInt("scrollGroupId", 0); - - final ItemType type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN); - _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - /** - * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will reset to 0), {@code false} otherwise - */ - public boolean isBlessed() - { - return _isBlessed; - } - - /** - * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise - */ - public boolean isBlessedDown() - { - return _isBlessedDown; - } - - /** - * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise - */ - public boolean isSafe() - { - return _isSafe; - } - - public boolean isGiant() - { - return _isGiant; - } - - /** - * @return id of scroll group that should be used - */ - public int getScrollGroupId() - { - return _scrollGroupId; - } - - /** - * Enforces current scroll to use only those items as possible items to enchant - * @param itemId - */ - public void addItem(int itemId) - { - if (_items == null) - { - _items = new HashSet<>(); - } - _items.add(itemId); - } - - public Set getItems() - { - return _items; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem the support item used when enchanting (can be null) - * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise - */ - @Override - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if ((_items != null) && !_items.contains(itemToEnchant.getId())) - { - return false; - } - else if ((supportItem != null)) - { - if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed())) - { - return false; - } - else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant())) - { - return false; - } - else if (!supportItem.isValid(itemToEnchant, supportItem)) - { - return false; - } - else if (supportItem.isWeapon() != isWeapon()) - { - return false; - } - } - if (_items == null) - { - for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls()) - { - if (scroll.getId() == getId()) - { - continue; - } - final Set scrollItems = scroll.getItems(); - if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId())) - { - return false; - } - } - } - return super.isValid(itemToEnchant, supportItem); - } - - /** - * @param player - * @param enchantItem - * @return the chance of current scroll's group. - */ - public double getChance(Player player, Item enchantItem) - { - if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); - return -1; - } - - final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); - if (group == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); - return -1; - } - - if ((getSafeEnchant() > 0) && (enchantItem.getEnchantLevel() < getSafeEnchant())) - { - return 100; - } - - return group.getChance(enchantItem.getEnchantLevel()); - } - - /** - * @param player - * @param enchantItem - * @param supportItem - * @return the total chance for success rate of this scroll - */ - public EnchantResultType calculateSuccess(Player player, Item enchantItem, EnchantSupportItem supportItem) - { - if (!isValid(enchantItem, supportItem)) - { - return EnchantResultType.ERROR; - } - - final double chance = getChance(player, enchantItem); - if (chance == -1) - { - return EnchantResultType.ERROR; - } - - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); - final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; - final double bonusRate = getBonusRate(); - final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; - final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100); - final double random = 100 * Rnd.nextDouble(); - final boolean success = (random < finalChance) || player.tryLuck(); - return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE; - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java deleted file mode 100644 index 12b33e468f..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public class EnchantSupportItem extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isDown; - private final boolean _isGiant; - private final ItemType type; - - public EnchantSupportItem(StatSet set) - { - super(set); - type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.ENCHT_WP_DOWN) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isDown = (type == EtcItemType.ENCHT_AM_DOWN) || (type == EtcItemType.ENCHT_WP_DOWN); - _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - public boolean isBlessed() - { - return _isBlessed; - } - - public boolean isDown() - { - return _isDown; - } - - public boolean isGiant() - { - return _isGiant; - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java deleted file mode 100644 index 5730665d9f..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * EtcItem Type enumerated. - */ -public enum EtcItemType implements ItemType -{ - NONE, - SCROLL, - ARROW, - POTION, - SPELLBOOK, - RECIPE, - MATERIAL, - PET_COLLAR, - CASTLE_GUARD, - DYE, - SEED, - SEED2, - HARVEST, - LOTTO, - RACE_TICKET, - TICKET_OF_LORD, - LURE, - CROP, - MATURECROP, - ENCHT_WP, - ENCHT_AM, - ENCHT_AM_DOWN, - ENCHT_WP_DOWN, - GIANT_ENCHT_WP, - GIANT_ENCHT_AM, - BLESS_ENCHT_WP, - BLESS_ENCHT_AM, - BLESS_ENCHT_AM_DOWN, - COUPON, - ELIXIR, - ENCHT_ATTR, - ENCHT_ATTR_CURSED, - BOLT, - ENCHT_ATTR_INC_PROP_ENCHT_WP, - ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_RUNE, - ENCHT_ATTRT_RUNE_SELECT, - TELEPORTBOOKMARK, - CHANGE_ATTR, - SOULSHOT, - SHAPE_SHIFTING_WP, - BLESS_SHAPE_SHIFTING_WP, - SHAPE_SHIFTING_WP_FIXED, - SHAPE_SHIFTING_AM, - BLESS_SHAPE_SHIFTING_AM, - SHAPE_SHIFTING_AM_FIXED, - SHAPE_SHIFTING_HAIRACC, - BLESS_SHAPE_SHIFTING_HAIRACC, - SHAPE_SHIFTING_HAIRACC_FIXED, - RESTORE_SHAPE_SHIFTING_WP, - RESTORE_SHAPE_SHIFTING_AM, - RESTORE_SHAPE_SHIFTING_HAIRACC, - RESTORE_SHAPE_SHIFTING_ALLITEM, - BLESS_INC_PROP_ENCHT_WP, - BLESS_INC_PROP_ENCHT_AM, - CARD_EVENT, - SHAPE_SHIFTING_ALLITEM_FIXED, - MULTI_ENCHT_WP, - MULTI_ENCHT_AM, - MULTI_INC_PROB_ENCHT_WP, - MULTI_INC_PROB_ENCHT_AM, - SOUL_CRYSTAL, - ENSOUL_STONE; - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return 0; - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c807e1298e..0fcb8c33e4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index a43b3964d6..b98f055fe3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/Quest.java index fd9165366d..20fbb1cd5f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -65,8 +65,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/Skill.java index dde442a756..269f26165b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 1e3ef93f48..43da93ac47 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java index f6cdf4df7f..80b0c140b1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index da2c567d17..a99ddb2dfe 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 402c603dac..645156f9c1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ee53743fce..31df739b0f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index c37fedbfb8..068f5c9368 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index ef63d53ef4..0546560e58 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 3eda159a36..c524cb94f1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index ddbf6666c9..c4b2ee6602 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index 45301710ad..e9fb2b0c78 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index e3239d2fe1..37d6a07943 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index de0c583a95..59a7a0e0bb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 3c8e441156..8548ad1d3a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index cfb6455ad0..31d29ef3dd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 8513b4d0da..1872b6fa54 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -42,8 +42,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6328a6f947..9b4fe72a7b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -53,10 +53,10 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index dc02d363c8..ea86074f0e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index cb0801a8d5..f8d8826556 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index d6df3726cc..47214311ac 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 0d59d2ff65..e8d7efa6b0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1963944528..15841de161 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 2ca0f283f9..4f351a636b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 6cc03e2c2b..48cdb8e80b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index c956d365f1..a41b731353 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 3cee24bfb0..161b8d0cab 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index ffd0ffbb36..67a4813cec 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java index 3d7c93c85c..c9b6d4dd3a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java @@ -22,8 +22,8 @@ import java.util.Set; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExTryEnchantArtifactResult; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 29f7828f27..a9fd8d923a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 12bc7c708d..79e1193ac0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 8a5f549b6f..5d9ff7b557 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 4759ba7fda..f511a8e30d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 1dca606dcd..36256ab955 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 18485fdbd4..4d3adf25dc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 989d2e582f..2c715b4efb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d7fcffbdb5..4468b67642 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index fca793bdc0..776e7f818f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 95512364b3..bba86e4e86 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 8ac47eea12..5364e67986 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index cb16d5cc7d..cd8e900014 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index de4094b252..db5981de3d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 8bbb0f99ff..899777642d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 61920f471b..f89be1cfcb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 8a2a0b5033..1b5eb14605 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 17fa6aeaf2..f02aaa9ace 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index e054f0f722..65d55dac0c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -38,10 +38,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 940b213621..d9a7fcb4cb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 6800a418cc..d257cb06cc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AlchemyResult; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index f144094dda..95a85c269b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java index 1fc0400b59..eafc924a43 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.ActionDataHolder; import org.l2jmobius.gameserver.model.ShortCuts; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 80d2ecee11..e5c25df330 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 73760d9e28..3b6cd21f20 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index e7a8e8baf6..7fbd7ebecb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 43960b870a..8bb6a1605c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 03e1f539c4..ac6b8358d4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index e8f3c75825..912dae684a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 25c9792ec1..3220827fbb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusInitPoint.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusInitPoint.java index 81cd4756f2..d907ed3377 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusInitPoint.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusInitPoint.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.homunculus; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index 0e95eb9b89..cdaefbe360 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51cd76618e..af8b12547e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 626ba1c351..f143a8aec9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 61fd93e55c..6063a54535 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index df2409c89e..0fc5fb1c75 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index 5a7a9c9c3b..a0ba15da9f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.holders.DamageTakenHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 12359bcd17..2cea176d69 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 93588924fe..077f33cb49 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 07725028a6..76375a86f7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c5c1d1141..81a384642c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index e4fb9e4160..b65005003d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 51abfa9d3e..f49138fafe 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 809a864983..395487097c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 2fe9967302..30dc837721 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 6691a8ea4f..cf3d83263f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 97b7b53cae..cb1379ac29 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index f826c75d4b..844fad86c7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index bd768c74e2..c4598a72e6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index c94eae4c08..00d7618d34 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ced39204d3..fbb5c84dfe 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4068629bde..d05590cbde 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 0e6211e63b..358ee2361b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index d48b66c6ef..9d9b24a54f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c742d534c4..c59568bf1d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index a22b36335e..35ca986d35 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 271ec4401b..37150ec357 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 6b8cd1358f..c32d4f7c04 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index ca4e7b7f5f..c1b8163a93 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro; /** diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 7553a3233e..fb0db44e8e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Guard; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/DocumentBase.java index c009919c53..7376c5da59 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -136,9 +139,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index e525165bcb..38cb684c22 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/DragonWeaponListeners.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/DragonWeaponListeners.java index 09171d6d97..c50af03d70 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/DragonWeaponListeners.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/DragonWeaponListeners.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemEquip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java index e7cfdef238..adf66d2a8a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExGetPremiumItemList; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SiegeGuards.java index 07d6a45613..ea67a6b16c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 418ed93b2a..4081019df2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 5c3d6867a2..1e08a1f98d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index a53c69fb80..680745b29d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 5b1db54836..e7113941ec 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index f73f3c2e73..5d3caadfd5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 0a82f9968d..35d31315ad 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 707e9387d1..8ab335bc8b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 58e28495eb..042ba14139 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHomunculusPoints.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHomunculusPoints.java index de6eeec586..19de566273 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHomunculusPoints.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHomunculusPoints.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index ef698d3144..98c614b7e5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 59e5b148a1..76d08b7a2b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index e1681d19a4..8e1d2e4ebd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index f7054e99e9..17d76b1bf6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index 1d104a4069..bb6ed54b11 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index c5a58222c9..81749c89a6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 19226dce0f..6cd820aedf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index ab33e22a5f..adc092f771 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 31621251be..62d5debb32 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index fae553ff45..991d2217b5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java index 30151c2b58..69cedcca0c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusBirthInfo; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 7d0f0b43ba..9723633d69 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 437b502a95..b8985f0fef 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 277a03c294..c98e55ac10 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java index 2e2e322e86..6183d5637e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index bfc65e27f5..879983272a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index d592bba597..96b98f6548 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index aa2eabd231..5690696b29 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 705ed225aa..a74d84251f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index ebbd33bda0..f952b58fa2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Heal.java index d480511447..c69477f113 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index ecebff8fcf..bbe94f05d2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d55c2897df..a58e246a0d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java index 06f3fb2e45..4e0e25e56f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 8f81770a04..53f0529429 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index af19b2276d..ded8b9bcbc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 7e60c89db5..2ca2c2fc70 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 6a58fbf31b..f4ff6be84c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java index 30b8b4d117..b5739976ad 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index c84a1eef1c..dc98162c19 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java index d43c368f7c..1d227df4d5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b485046a39..25c237e53f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 83860039e2..a22aaf477d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java index 0767b28991..6c95915b62 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java index 8c1be275c7..200a0cc1fd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index 5461a0259e..7b898d2461 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index d21bbf334e..ff11355aa7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index ba621c653f..f553a0c846 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 9b16668969..119fe1f81e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 669c6bd362..604b134414 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index f45a96746c..7d8ad117db 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index e1384fe3e2..b527922050 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java index c835ed0702..7976256d7f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 4db0961a07..416fa8a65a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index c6d8ec7a1b..1f44066740 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 98ae8c4eaf..353347df87 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index ff9e654e61..3aeadd38a7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/TeleportCube.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/TeleportCube.java index 43078b25dd..7d01936f04 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/TeleportCube.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/TeleportCube.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import quests.Q10589_WhereFatesIntersect.Q10589_WhereFatesIntersect; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index f40ab6c057..ab5ba58a10 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/CreatureAI.java index faa49497bf..3dd42f74db 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/ItemTable.java index 5fdb316882..439c38d1e5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -48,12 +48,12 @@ import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.AmmunitionSkillList; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index d508b71aef..fd2a491d66 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 0f8815bcc4..475f0085d8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index a213d965da..cab4dfa0e9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java index 426e9dd06f..6c261d6ded 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/CollectionData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/CollectionData.java index 40504de824..baf3bcf2b8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/CollectionData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/CollectionData.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.CollectionDataHolder; import org.l2jmobius.gameserver.model.holders.ItemCollectionData; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Written by Berezkin Nikolay, on 04.05.2021 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index 1966613539..294a8b45f6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index cc0f4afb20..f7568ac960 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author Mobius diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 3f7c8ab166..02089dc8c1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/VariationData.java index 392612cd2d..c29a10baa2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index 1b5d73308d..4ed0600683 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/ItemGrade.java index ad9e39c36d..11ea4c3bd8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 557c5e108a..48a6f07b3c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index efa12b90bc..662dbf7c39 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index ce03808800..7799768d15 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ArmorSet.java index 9aa27bc064..14226149e5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CombatFlag.java index e726f912f1..e0487f9079 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CursedWeapon.java index d9dd1c9b65..2301aacbc4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Party.java index 12321a158f..1bd1eeb1cc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Party.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Seed.java index 13caeeb575..2dc7f967bb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java index d199976edc..a9fd529ecc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeList.java index bbafcb1416..bea714862c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0eca80504c..e3f680ef86 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -63,8 +63,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java index c60942df43..1402dccb4b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java index 573163b747..f7b00eb570 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java index 1e9d060405..aacbb001fc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -239,21 +239,21 @@ import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.homunculus.HomunculusList; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Summon.java index 4eb006b5f2..5c0f977ccc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 70166bae98..cdbe566796 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 4da5b23f77..02b8e77771 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index 3594c14845..5672633fc9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; public class PlayableStat extends CreatureStat diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index aae970603a..e296ba2cca 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SubClassHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index da03c6b165..d93e4def4d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 0190272650..df278a30d8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionMaximumVitalityPoints.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionMaximumVitalityPoints.java index 5e2d332711..f395f4581b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionMaximumVitalityPoints.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionMaximumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9c053efc5e..ebe8b7499f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 5b4ab6daf1..d68a40ee75 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 85c89d15ec..4c9bc6856c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 68990650dd..c08b648e55 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java index 58bd23cf07..5edfafb200 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index a5fea7c6f6..347f281026 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 2f1424657f..b5b9ac8025 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -132,15 +132,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java index f65fcabe54..e0317b1c0a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java index 780dbd83e4..51ec6c9e3d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java index 81e8c9eb16..bf1d1237f1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index af538045b8..d391a4faf1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 79c69f739d..41f554b9e0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index b86121305d..b18ff0fce9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java index d01b97cc2c..fcd3b7c0ba 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.model.TradeItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/Armor.java index d11c43f9cc..f65945c191 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/Henna.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/Henna.java new file mode 100644 index 0000000000..0d1de91388 --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -0,0 +1,183 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; + +/** + * Class for the Henna object. + * @author Zoey76 + */ +public class Henna +{ + private final int _dyeId; + private final int _dyeItemId; + private final boolean _isPremium; + private final Map _baseStats = new EnumMap<>(BaseStat.class); + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final int _duration; + private final List _skills; + private final List _wearClass; + + public Henna(StatSet set) + { + _dyeId = set.getInt("dyeId"); + _dyeItemId = set.getInt("dyeItemId"); + _isPremium = set.getBoolean("isPremium", false); + _baseStats.put(BaseStat.STR, set.getInt("str", 0)); + _baseStats.put(BaseStat.CON, set.getInt("con", 0)); + _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); + _baseStats.put(BaseStat.INT, set.getInt("int", 0)); + _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); + _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); + _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); + _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _duration = set.getInt("duration", -1); + _skills = new ArrayList<>(); + _wearClass = new ArrayList<>(); + } + + /** + * @return the dye Id. + */ + public int getDyeId() + { + return _dyeId; + } + + /** + * @return the item Id, required for this dye. + */ + public int getDyeItemId() + { + return _dyeItemId; + } + + /** + * @return true if this dye is premium. + */ + public boolean isPremium() + { + return _isPremium; + } + + public int getBaseStats(BaseStat stat) + { + return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); + } + + public Map getBaseStats() + { + return _baseStats; + } + + /** + * @return the wear fee, cost for adding this dye to the player. + */ + public int getWearFee() + { + return _wearFee; + } + + /** + * @return the wear count, the required count to add this dye to the player. + */ + public int getWearCount() + { + return _wearCount; + } + + /** + * @return the cancel fee, cost for removing this dye from the player. + */ + public int getCancelFee() + { + return _cancelFee; + } + + /** + * @return the cancel count, the retrieved amount of dye items after removing the dye. + */ + public int getCancelCount() + { + return _cancelCount; + } + + /** + * @return the duration of this dye. + */ + public int getDuration() + { + return _duration; + } + + /** + * @param skillList the list of skills related to this dye. + */ + public void setSkills(List skillList) + { + _skills.addAll(skillList); + } + + /** + * @return the skills related to this dye. + */ + public List getSkills() + { + return _skills; + } + + /** + * @return the list with the allowed classes to wear this dye. + */ + public List getAllowedWearClass() + { + return _wearClass; + } + + /** + * @param classId the class trying to wear this dye. + * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. + */ + public boolean isAllowedClass(ClassId classId) + { + return _wearClass.contains(classId); + } + + /** + * @param wearClassIds the list of classes that can wear this dye. + */ + public void setWearClassIds(List wearClassIds) + { + _wearClass.addAll(wearClassIds); + } +} \ No newline at end of file diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index d58318fe05..4b205f2acf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java new file mode 100644 index 0000000000..b289fa70ae --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -0,0 +1,300 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.Collection; +import java.util.Objects; + +import org.l2jmobius.gameserver.enums.AttributeType; +import org.l2jmobius.gameserver.model.VariationInstance; +import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * This class contains Item
+ * Use to sort Item of : + *
    + *
  • Armor
    • + *
  • EtcItem
    • + *
  • Weapon
    • + *
+ * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ + */ +public class WarehouseItem +{ + private final ItemTemplate _item; + private final int _object; + private final long _count; + private final int _owner; + private final int _locationSlot; + private final int _enchant; + private final CrystalType _grade; + private final VariationInstance _augmentation; + private final int _customType1; + private final int _customType2; + private final int _mana; + + private byte _elemAtkType = -2; + private int _elemAtkPower = 0; + + private final int[] _elemDefAttr = + { + 0, + 0, + 0, + 0, + 0, + 0 + }; + + private final int[] _enchantOptions; + private final Collection _soulCrystalOptions; + private final Collection _soulCrystalSpecialOptions; + + private final int _time; + + public WarehouseItem(Item item) + { + Objects.requireNonNull(item); + _item = item.getItem(); + _object = item.getObjectId(); + _count = item.getCount(); + _owner = item.getOwnerId(); + _locationSlot = item.getLocationSlot(); + _enchant = item.getEnchantLevel(); + _customType1 = item.getCustomType1(); + _customType2 = item.getCustomType2(); + _grade = item.getItem().getCrystalType(); + _augmentation = item.getAugmentation(); + _mana = item.getMana(); + _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; + _elemAtkType = item.getAttackAttributeType().getClientId(); + _elemAtkPower = item.getAttackAttributePower(); + for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) + { + _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); + } + _enchantOptions = item.getEnchantOptions(); + _soulCrystalOptions = item.getSpecialAbilities(); + _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); + } + + /** + * @return the item. + */ + public ItemTemplate getItem() + { + return _item; + } + + /** + * @return the unique objectId. + */ + public int getObjectId() + { + return _object; + } + + /** + * @return the owner. + */ + public int getOwnerId() + { + return _owner; + } + + /** + * @return the location slot. + */ + public int getLocationSlot() + { + return _locationSlot; + } + + /** + * @return the count. + */ + public long getCount() + { + return _count; + } + + /** + * @return the first type. + */ + public int getType1() + { + return _item.getType1(); + } + + /** + * @return the second type. + */ + public int getType2() + { + return _item.getType2(); + } + + /** + * @return the second type. + */ + public ItemType getItemType() + { + return _item.getItemType(); + } + + /** + * @return the ItemId. + */ + public int getItemId() + { + return _item.getId(); + } + + /** + * @return the part of body used with this item. + */ + public long getBodyPart() + { + return _item.getBodyPart(); + } + + /** + * @return the enchant level. + */ + public int getEnchantLevel() + { + return _enchant; + } + + /** + * @return the item grade + */ + public CrystalType getItemGrade() + { + return _grade; + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + public boolean isWeapon() + { + return (_item instanceof Weapon); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise. + */ + public boolean isArmor() + { + return (_item instanceof Armor); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + public boolean isEtcItem() + { + return (_item instanceof EtcItem); + } + + /** + * @return the name of the item + */ + public String getItemName() + { + return _item.getName(); + } + + /** + * @return the augmentation If. + */ + public VariationInstance getAugmentation() + { + return _augmentation; + } + + /** + * @return the name of the item + */ + public String getName() + { + return _item.getName(); + } + + public int getCustomType1() + { + return _customType1; + } + + public int getCustomType2() + { + return _customType2; + } + + public int getMana() + { + return _mana; + } + + public byte getAttackElementType() + { + return _elemAtkType; + } + + public int getAttackElementPower() + { + return _elemAtkPower; + } + + public int getElementDefAttr(byte i) + { + return _elemDefAttr[i]; + } + + public int[] getEnchantOptions() + { + return _enchantOptions; + } + + public Collection getSoulCrystalOptions() + { + return _soulCrystalOptions; + } + + public Collection getSoulCrystalSpecialOptions() + { + return _soulCrystalSpecialOptions; + } + + public int getTime() + { + return _time; + } + + /** + * @return the name of the item + */ + @Override + public String toString() + { + return _item.toString(); + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/Weapon.java similarity index 94% rename from L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Weapon.java rename to L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/Weapon.java index 832169f5f1..4599d5047f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java new file mode 100644 index 0000000000..610e720125 --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -0,0 +1,558 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.network.SystemMessageId; + +/** + * @author UnAfraid + */ +public class AppearanceStone +{ + private final int _id; + private final int _cost; + private final int _visualId; + private final long _lifeTime; + private final AppearanceType _type; + private final WeaponType _weaponType; + private final ArmorType _armorType; + private final AppearanceHandType _handType; + private final AppearanceMagicType _magicType; + private List _crystalTypes; + private List _targetTypes; + private List _bodyParts; + private List _races; + private List _racesNot; + private List _allVisualIds; + + public AppearanceStone(StatSet set) + { + _id = set.getInt("id"); + _visualId = set.getInt("visualId", 0); + _cost = set.getInt("cost", 0); + _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); + _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); + _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); + _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); + _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); + _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); + + final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); + if (targetType != AppearanceTargetType.NONE) + { + addTargetType(targetType); + } + + // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. + final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); + + // If no crystal type is defined, we must add all defaults. + if (crystalType == null) + { + switch (targetType) + { + case ACCESSORY: + case ALL: + { + addCrystalType(CrystalType.NONE); + // fallthrough + } + case WEAPON: + case ARMOR: + { + for (CrystalType cryType : CrystalType.values()) + { + if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) + { + addCrystalType(cryType); + } + } + } + } + } + else + { + addCrystalType(crystalType); + } + + final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); + if (bodyPart != ItemTemplate.SLOT_NONE) + { + addBodyPart(bodyPart); + } + + final Race race = set.getEnum("race", Race.class, Race.NONE); + if (race != Race.NONE) + { + addRace(race); + } + + final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); + if (raceNot != Race.NONE) + { + addRaceNot(raceNot); + } + } + + public int getId() + { + return _id; + } + + public int getVisualId() + { + return _visualId; + } + + public int getCost() + { + return _cost; + } + + public long getLifeTime() + { + return _lifeTime; + } + + public AppearanceType getType() + { + return _type; + } + + public WeaponType getWeaponType() + { + return _weaponType; + } + + public ArmorType getArmorType() + { + return _armorType; + } + + public AppearanceHandType getHandType() + { + return _handType; + } + + public AppearanceMagicType getMagicType() + { + return _magicType; + } + + public void addCrystalType(CrystalType type) + { + if (_crystalTypes == null) + { + _crystalTypes = new ArrayList<>(); + } + _crystalTypes.add(type); + } + + public List getCrystalTypes() + { + return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); + } + + public void addTargetType(AppearanceTargetType type) + { + if (_targetTypes == null) + { + _targetTypes = new ArrayList<>(); + } + _targetTypes.add(type); + } + + public List getTargetTypes() + { + return _targetTypes != null ? _targetTypes : Collections.emptyList(); + } + + public void addBodyPart(long part) + { + if (_bodyParts == null) + { + _bodyParts = new ArrayList<>(); + } + _bodyParts.add(part); + } + + public void addVisualId(AppearanceHolder appearanceHolder) + { + if (_allVisualIds == null) + { + _allVisualIds = new ArrayList<>(); + } + _allVisualIds.add(appearanceHolder); + } + + public List getVisualIds() + { + return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); + } + + public List getBodyParts() + { + return _bodyParts != null ? _bodyParts : Collections.emptyList(); + } + + public void addRace(Race race) + { + if (_races == null) + { + _races = new ArrayList<>(); + } + _races.add(race); + } + + public List getRaces() + { + return _races != null ? _races : Collections.emptyList(); + } + + public void addRaceNot(Race race) + { + if (_racesNot == null) + { + _racesNot = new ArrayList<>(); + } + _racesNot.add(race); + } + + public List getRacesNot() + { + return _racesNot != null ? _racesNot : Collections.emptyList(); + } + + /** + * @param player the actor requesting to use this appearance. + * @param targetItem the item to be modified with this appearance. + * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. + */ + public boolean checkConditions(Player player, Item targetItem) + { + if (targetItem == null) + { + return false; + } + + if (getTargetTypes().isEmpty()) + { + return false; + } + + if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); + return false; + } + + switch (_type) + { + case RESTORE: + { + if (targetItem.getVisualId() == 0) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); + return false; + } + + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + default: + { + // Seems like in retail item with already changed appearance, can be changed again without being restored. + + final AppearanceTargetType targetType = getTargetTypes().get(0); + switch (targetType) + { + case NONE: + { + return false; + } + case WEAPON: + { + if (!targetItem.isWeapon()) + { + player.sendPacket(SystemMessageId.WEAPONS_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ARMOR: + { + if (!targetItem.isArmor()) + { + player.sendPacket(SystemMessageId.ARMOR_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ACCESSORY: + { + if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + { + player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); + return false; + } + break; + } + case ALL: + { + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (findVisualChange(targetItem) == null) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + return true; + } + } + break; + } + } + + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (_weaponType != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) + { + if (_weaponType != WeaponType.CROSSBOW) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + } + + switch (_handType) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + } + + switch (_magicType) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + if (_armorType != ArmorType.NONE) + { + switch (_armorType) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + return true; + } + + public AppearanceHolder findVisualChange(Item targetItem) + { + for (AppearanceHolder holder : _allVisualIds) + { + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + { + continue; + } + + if (holder.getWeaponType() != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) + { + if (holder.getWeaponType() != WeaponType.CROSSBOW) + { + continue; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + continue; + } + } + + switch (holder.getHandType()) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + continue; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + continue; + } + break; + } + } + + switch (holder.getMagicType()) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + continue; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + continue; + } + } + } + } + + if (holder.getArmorType() != ArmorType.NONE) + { + switch (holder.getArmorType()) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + continue; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + continue; + } + } + } + } + return holder; + } + return null; + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java similarity index 93% rename from L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java rename to L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java index 6c2b4c08a5..53b89b29bf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; import java.util.EnumMap; import java.util.Map; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java new file mode 100644 index 0000000000..76176d2ab3 --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -0,0 +1,212 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.logging.Logger; + +import org.l2jmobius.commons.util.CommonUtil; +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public abstract class AbstractEnchantItem +{ + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); + + private static final ItemType[] ENCHANT_TYPES = new ItemType[] + { + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + EtcItemType.BLESS_ENCHT_AM, + EtcItemType.BLESS_ENCHT_AM_DOWN, + EtcItemType.BLESS_ENCHT_WP, + EtcItemType.ENCHT_AM, + EtcItemType.ENCHT_WP, + EtcItemType.ENCHT_WP_DOWN, + EtcItemType.ENCHT_AM_DOWN, + EtcItemType.GIANT_ENCHT_AM, + EtcItemType.GIANT_ENCHT_WP, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + }; + + private final int _id; + private final CrystalType _grade; + private final int _minEnchantLevel; + private final int _maxEnchantLevel; + private final int _safeEnchantLevel; + private final int _randomEnchantMin; + private final int _randomEnchantMax; + private final double _bonusRate; + + public AbstractEnchantItem(StatSet set) + { + _id = set.getInt("id"); + if (getItem() == null) + { + throw new NullPointerException(); + } + else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) + { + throw new IllegalAccessError(); + } + _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); + _minEnchantLevel = set.getInt("minEnchant", 0); + _maxEnchantLevel = set.getInt("maxEnchant", 127); + _safeEnchantLevel = set.getInt("safeEnchant", 0); + _randomEnchantMin = set.getInt("randomEnchantMin", 1); + _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); + _bonusRate = set.getDouble("bonusRate", 0); + } + + /** + * @return id of current item + */ + public int getId() + { + return _id; + } + + /** + * @return bonus chance that would be added + */ + public double getBonusRate() + { + return _bonusRate; + } + + /** + * @return {@link ItemTemplate} current item/scroll + */ + public ItemTemplate getItem() + { + return ItemTable.getInstance().getTemplate(_id); + } + + /** + * @return grade of the item/scroll. + */ + public CrystalType getGrade() + { + return _grade; + } + + /** + * @return {@code true} if scroll is for weapon, {@code false} for armor + */ + public abstract boolean isWeapon(); + + /** + * @return the minimum enchant level that this scroll/item can be used with + */ + public int getMinEnchantLevel() + { + return _minEnchantLevel; + } + + /** + * @return the maximum enchant level that this scroll/item can be used with + */ + public int getMaxEnchantLevel() + { + return _maxEnchantLevel; + } + + /** + * @return the safe enchant level of this scroll/item + */ + public int getSafeEnchant() + { + return _safeEnchantLevel; + } + + /** + * @return the minimum random enchant level of this scroll/item + */ + public int getRandomEnchantMin() + { + return _randomEnchantMin; + } + + /** + * @return the maximum random enchant level of this scroll/item + */ + public int getRandomEnchantMax() + { + return _randomEnchantMax; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem + * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise + */ + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if (itemToEnchant == null) + { + return false; + } + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + { + return false; + } + else if (!isValidItemType(itemToEnchant.getItem().getType2())) + { + return false; + } + else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) + { + return false; + } + else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + { + return false; + } + return true; + } + + /** + * @param type2 + * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise + */ + private boolean isValidItemType(int type2) + { + if (type2 == ItemTemplate.TYPE2_WEAPON) + { + return isWeapon(); + } + else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) + { + return !isWeapon(); + } + return false; + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..1099b77054 --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private long _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(long slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java new file mode 100644 index 0000000000..ea29d773db --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -0,0 +1,225 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.HashSet; +import java.util.Set; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.data.xml.EnchantItemData; +import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author UnAfraid + */ +public class EnchantScroll extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isBlessedDown; + private final boolean _isSafe; + private final boolean _isGiant; + private final int _scrollGroupId; + private Set _items; + + public EnchantScroll(StatSet set) + { + super(set); + _scrollGroupId = set.getInt("scrollGroupId", 0); + + final ItemType type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN); + _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + /** + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will reset to 0), {@code false} otherwise + */ + public boolean isBlessed() + { + return _isBlessed; + } + + /** + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise + */ + public boolean isBlessedDown() + { + return _isBlessedDown; + } + + /** + * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise + */ + public boolean isSafe() + { + return _isSafe; + } + + public boolean isGiant() + { + return _isGiant; + } + + /** + * @return id of scroll group that should be used + */ + public int getScrollGroupId() + { + return _scrollGroupId; + } + + /** + * Enforces current scroll to use only those items as possible items to enchant + * @param itemId + */ + public void addItem(int itemId) + { + if (_items == null) + { + _items = new HashSet<>(); + } + _items.add(itemId); + } + + public Set getItems() + { + return _items; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem the support item used when enchanting (can be null) + * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise + */ + @Override + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if ((_items != null) && !_items.contains(itemToEnchant.getId())) + { + return false; + } + else if ((supportItem != null)) + { + if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed())) + { + return false; + } + else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant())) + { + return false; + } + else if (!supportItem.isValid(itemToEnchant, supportItem)) + { + return false; + } + else if (supportItem.isWeapon() != isWeapon()) + { + return false; + } + } + if (_items == null) + { + for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls()) + { + if (scroll.getId() == getId()) + { + continue; + } + final Set scrollItems = scroll.getItems(); + if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId())) + { + return false; + } + } + } + return super.isValid(itemToEnchant, supportItem); + } + + /** + * @param player + * @param enchantItem + * @return the chance of current scroll's group. + */ + public double getChance(Player player, Item enchantItem) + { + if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) + { + LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); + return -1; + } + + final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); + if (group == null) + { + LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); + return -1; + } + + if ((getSafeEnchant() > 0) && (enchantItem.getEnchantLevel() < getSafeEnchant())) + { + return 100; + } + + return group.getChance(enchantItem.getEnchantLevel()); + } + + /** + * @param player + * @param enchantItem + * @param supportItem + * @return the total chance for success rate of this scroll + */ + public EnchantResultType calculateSuccess(Player player, Item enchantItem, EnchantSupportItem supportItem) + { + if (!isValid(enchantItem, supportItem)) + { + return EnchantResultType.ERROR; + } + + final double chance = getChance(player, enchantItem); + if (chance == -1) + { + return EnchantResultType.ERROR; + } + + final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; + final double bonusRate = getBonusRate(); + final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; + final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100); + final double random = 100 * Rnd.nextDouble(); + final boolean success = (random < finalChance) || player.tryLuck(); + return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE; + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java new file mode 100644 index 0000000000..308f08c38b --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -0,0 +1,64 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public class EnchantSupportItem extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isDown; + private final boolean _isGiant; + private final ItemType type; + + public EnchantSupportItem(StatSet set) + { + super(set); + type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.ENCHT_WP_DOWN) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isDown = (type == EtcItemType.ENCHT_AM_DOWN) || (type == EtcItemType.ENCHT_WP_DOWN); + _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + public boolean isBlessed() + { + return _isBlessed; + } + + public boolean isDown() + { + return _isDown; + } + + public boolean isGiant() + { + return _isGiant; + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java index e0c5dc5b59..bd90178552 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -75,15 +75,15 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java similarity index 94% rename from L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java rename to L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java index 2920bda8fa..d325c3ffa9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Crystal Type enumerated. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java new file mode 100644 index 0000000000..c9c153923e --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -0,0 +1,106 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * EtcItem Type enumerated. + */ +public enum EtcItemType implements ItemType +{ + NONE, + SCROLL, + ARROW, + POTION, + SPELLBOOK, + RECIPE, + MATERIAL, + PET_COLLAR, + CASTLE_GUARD, + DYE, + SEED, + SEED2, + HARVEST, + LOTTO, + RACE_TICKET, + TICKET_OF_LORD, + LURE, + CROP, + MATURECROP, + ENCHT_WP, + ENCHT_AM, + ENCHT_AM_DOWN, + ENCHT_WP_DOWN, + GIANT_ENCHT_WP, + GIANT_ENCHT_AM, + BLESS_ENCHT_WP, + BLESS_ENCHT_AM, + BLESS_ENCHT_AM_DOWN, + COUPON, + ELIXIR, + ENCHT_ATTR, + ENCHT_ATTR_CURSED, + BOLT, + ENCHT_ATTR_INC_PROP_ENCHT_WP, + ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_RUNE, + ENCHT_ATTRT_RUNE_SELECT, + TELEPORTBOOKMARK, + CHANGE_ATTR, + SOULSHOT, + SHAPE_SHIFTING_WP, + BLESS_SHAPE_SHIFTING_WP, + SHAPE_SHIFTING_WP_FIXED, + SHAPE_SHIFTING_AM, + BLESS_SHAPE_SHIFTING_AM, + SHAPE_SHIFTING_AM_FIXED, + SHAPE_SHIFTING_HAIRACC, + BLESS_SHAPE_SHIFTING_HAIRACC, + SHAPE_SHIFTING_HAIRACC_FIXED, + RESTORE_SHAPE_SHIFTING_WP, + RESTORE_SHAPE_SHIFTING_AM, + RESTORE_SHAPE_SHIFTING_HAIRACC, + RESTORE_SHAPE_SHIFTING_ALLITEM, + BLESS_INC_PROP_ENCHT_WP, + BLESS_INC_PROP_ENCHT_AM, + CARD_EVENT, + SHAPE_SHIFTING_ALLITEM_FIXED, + MULTI_ENCHT_WP, + MULTI_ENCHT_AM, + MULTI_INC_PROB_ENCHT_WP, + MULTI_INC_PROB_ENCHT_AM, + SOUL_CRYSTAL, + ENSOUL_STONE; + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return 0; + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 8323d4bdc7..06760564d7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index a4e29d4a78..19e7395abf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -54,13 +54,13 @@ import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 9f50c399b6..aec33c3013 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,10 +40,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Henna.java deleted file mode 100644 index 426a12682a..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/Henna.java +++ /dev/null @@ -1,183 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; - -import org.l2jmobius.gameserver.enums.ClassId; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; - -/** - * Class for the Henna object. - * @author Zoey76 - */ -public class Henna -{ - private final int _dyeId; - private final int _dyeItemId; - private final boolean _isPremium; - private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wearFee; - private final int _wearCount; - private final int _cancelFee; - private final int _cancelCount; - private final int _duration; - private final List _skills; - private final List _wearClass; - - public Henna(StatSet set) - { - _dyeId = set.getInt("dyeId"); - _dyeItemId = set.getInt("dyeItemId"); - _isPremium = set.getBoolean("isPremium", false); - _baseStats.put(BaseStat.STR, set.getInt("str", 0)); - _baseStats.put(BaseStat.CON, set.getInt("con", 0)); - _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); - _baseStats.put(BaseStat.INT, set.getInt("int", 0)); - _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); - _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); - _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wearFee = set.getInt("wear_fee"); - _wearCount = set.getInt("wear_count"); - _cancelFee = set.getInt("cancel_fee"); - _cancelCount = set.getInt("cancel_count"); - _duration = set.getInt("duration", -1); - _skills = new ArrayList<>(); - _wearClass = new ArrayList<>(); - } - - /** - * @return the dye Id. - */ - public int getDyeId() - { - return _dyeId; - } - - /** - * @return the item Id, required for this dye. - */ - public int getDyeItemId() - { - return _dyeItemId; - } - - /** - * @return true if this dye is premium. - */ - public boolean isPremium() - { - return _isPremium; - } - - public int getBaseStats(BaseStat stat) - { - return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); - } - - public Map getBaseStats() - { - return _baseStats; - } - - /** - * @return the wear fee, cost for adding this dye to the player. - */ - public int getWearFee() - { - return _wearFee; - } - - /** - * @return the wear count, the required count to add this dye to the player. - */ - public int getWearCount() - { - return _wearCount; - } - - /** - * @return the cancel fee, cost for removing this dye from the player. - */ - public int getCancelFee() - { - return _cancelFee; - } - - /** - * @return the cancel count, the retrieved amount of dye items after removing the dye. - */ - public int getCancelCount() - { - return _cancelCount; - } - - /** - * @return the duration of this dye. - */ - public int getDuration() - { - return _duration; - } - - /** - * @param skillList the list of skills related to this dye. - */ - public void setSkills(List skillList) - { - _skills.addAll(skillList); - } - - /** - * @return the skills related to this dye. - */ - public List getSkills() - { - return _skills; - } - - /** - * @return the list with the allowed classes to wear this dye. - */ - public List getAllowedWearClass() - { - return _wearClass; - } - - /** - * @param classId the class trying to wear this dye. - * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. - */ - public boolean isAllowedClass(ClassId classId) - { - return _wearClass.contains(classId); - } - - /** - * @param wearClassIds the list of classes that can wear this dye. - */ - public void setWearClassIds(List wearClassIds) - { - _wearClass.addAll(wearClassIds); - } -} \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java deleted file mode 100644 index 5618132356..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ /dev/null @@ -1,300 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.Collection; -import java.util.Objects; - -import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * This class contains Item
- * Use to sort Item of : - *
    - *
  • Armor
    • - *
  • EtcItem
    • - *
  • Weapon
    • - *
- * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ - */ -public class WarehouseItem -{ - private final ItemTemplate _item; - private final int _object; - private final long _count; - private final int _owner; - private final int _locationSlot; - private final int _enchant; - private final CrystalType _grade; - private final VariationInstance _augmentation; - private final int _customType1; - private final int _customType2; - private final int _mana; - - private byte _elemAtkType = -2; - private int _elemAtkPower = 0; - - private final int[] _elemDefAttr = - { - 0, - 0, - 0, - 0, - 0, - 0 - }; - - private final int[] _enchantOptions; - private final Collection _soulCrystalOptions; - private final Collection _soulCrystalSpecialOptions; - - private final int _time; - - public WarehouseItem(Item item) - { - Objects.requireNonNull(item); - _item = item.getItem(); - _object = item.getObjectId(); - _count = item.getCount(); - _owner = item.getOwnerId(); - _locationSlot = item.getLocationSlot(); - _enchant = item.getEnchantLevel(); - _customType1 = item.getCustomType1(); - _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); - _augmentation = item.getAugmentation(); - _mana = item.getMana(); - _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; - _elemAtkType = item.getAttackAttributeType().getClientId(); - _elemAtkPower = item.getAttackAttributePower(); - for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) - { - _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); - } - _enchantOptions = item.getEnchantOptions(); - _soulCrystalOptions = item.getSpecialAbilities(); - _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); - } - - /** - * @return the item. - */ - public ItemTemplate getItem() - { - return _item; - } - - /** - * @return the unique objectId. - */ - public int getObjectId() - { - return _object; - } - - /** - * @return the owner. - */ - public int getOwnerId() - { - return _owner; - } - - /** - * @return the location slot. - */ - public int getLocationSlot() - { - return _locationSlot; - } - - /** - * @return the count. - */ - public long getCount() - { - return _count; - } - - /** - * @return the first type. - */ - public int getType1() - { - return _item.getType1(); - } - - /** - * @return the second type. - */ - public int getType2() - { - return _item.getType2(); - } - - /** - * @return the second type. - */ - public ItemType getItemType() - { - return _item.getItemType(); - } - - /** - * @return the ItemId. - */ - public int getItemId() - { - return _item.getId(); - } - - /** - * @return the part of body used with this item. - */ - public long getBodyPart() - { - return _item.getBodyPart(); - } - - /** - * @return the enchant level. - */ - public int getEnchantLevel() - { - return _enchant; - } - - /** - * @return the item grade - */ - public CrystalType getItemGrade() - { - return _grade; - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - public boolean isWeapon() - { - return (_item instanceof Weapon); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise. - */ - public boolean isArmor() - { - return (_item instanceof Armor); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - public boolean isEtcItem() - { - return (_item instanceof EtcItem); - } - - /** - * @return the name of the item - */ - public String getItemName() - { - return _item.getName(); - } - - /** - * @return the augmentation If. - */ - public VariationInstance getAugmentation() - { - return _augmentation; - } - - /** - * @return the name of the item - */ - public String getName() - { - return _item.getName(); - } - - public int getCustomType1() - { - return _customType1; - } - - public int getCustomType2() - { - return _customType2; - } - - public int getMana() - { - return _mana; - } - - public byte getAttackElementType() - { - return _elemAtkType; - } - - public int getAttackElementPower() - { - return _elemAtkPower; - } - - public int getElementDefAttr(byte i) - { - return _elemDefAttr[i]; - } - - public int[] getEnchantOptions() - { - return _enchantOptions; - } - - public Collection getSoulCrystalOptions() - { - return _soulCrystalOptions; - } - - public Collection getSoulCrystalSpecialOptions() - { - return _soulCrystalSpecialOptions; - } - - public int getTime() - { - return _time; - } - - /** - * @return the name of the item - */ - @Override - public String toString() - { - return _item.toString(); - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java deleted file mode 100644 index a568389489..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ /dev/null @@ -1,558 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author UnAfraid - */ -public class AppearanceStone -{ - private final int _id; - private final int _cost; - private final int _visualId; - private final long _lifeTime; - private final AppearanceType _type; - private final WeaponType _weaponType; - private final ArmorType _armorType; - private final AppearanceHandType _handType; - private final AppearanceMagicType _magicType; - private List _crystalTypes; - private List _targetTypes; - private List _bodyParts; - private List _races; - private List _racesNot; - private List _allVisualIds; - - public AppearanceStone(StatSet set) - { - _id = set.getInt("id"); - _visualId = set.getInt("visualId", 0); - _cost = set.getInt("cost", 0); - _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); - _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); - _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); - _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); - _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); - _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); - - final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); - if (targetType != AppearanceTargetType.NONE) - { - addTargetType(targetType); - } - - // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. - final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); - - // If no crystal type is defined, we must add all defaults. - if (crystalType == null) - { - switch (targetType) - { - case ACCESSORY: - case ALL: - { - addCrystalType(CrystalType.NONE); - // fallthrough - } - case WEAPON: - case ARMOR: - { - for (CrystalType cryType : CrystalType.values()) - { - if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) - { - addCrystalType(cryType); - } - } - } - } - } - else - { - addCrystalType(crystalType); - } - - final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); - if (bodyPart != ItemTemplate.SLOT_NONE) - { - addBodyPart(bodyPart); - } - - final Race race = set.getEnum("race", Race.class, Race.NONE); - if (race != Race.NONE) - { - addRace(race); - } - - final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); - if (raceNot != Race.NONE) - { - addRaceNot(raceNot); - } - } - - public int getId() - { - return _id; - } - - public int getVisualId() - { - return _visualId; - } - - public int getCost() - { - return _cost; - } - - public long getLifeTime() - { - return _lifeTime; - } - - public AppearanceType getType() - { - return _type; - } - - public WeaponType getWeaponType() - { - return _weaponType; - } - - public ArmorType getArmorType() - { - return _armorType; - } - - public AppearanceHandType getHandType() - { - return _handType; - } - - public AppearanceMagicType getMagicType() - { - return _magicType; - } - - public void addCrystalType(CrystalType type) - { - if (_crystalTypes == null) - { - _crystalTypes = new ArrayList<>(); - } - _crystalTypes.add(type); - } - - public List getCrystalTypes() - { - return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); - } - - public void addTargetType(AppearanceTargetType type) - { - if (_targetTypes == null) - { - _targetTypes = new ArrayList<>(); - } - _targetTypes.add(type); - } - - public List getTargetTypes() - { - return _targetTypes != null ? _targetTypes : Collections.emptyList(); - } - - public void addBodyPart(long part) - { - if (_bodyParts == null) - { - _bodyParts = new ArrayList<>(); - } - _bodyParts.add(part); - } - - public void addVisualId(AppearanceHolder appearanceHolder) - { - if (_allVisualIds == null) - { - _allVisualIds = new ArrayList<>(); - } - _allVisualIds.add(appearanceHolder); - } - - public List getVisualIds() - { - return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); - } - - public List getBodyParts() - { - return _bodyParts != null ? _bodyParts : Collections.emptyList(); - } - - public void addRace(Race race) - { - if (_races == null) - { - _races = new ArrayList<>(); - } - _races.add(race); - } - - public List getRaces() - { - return _races != null ? _races : Collections.emptyList(); - } - - public void addRaceNot(Race race) - { - if (_racesNot == null) - { - _racesNot = new ArrayList<>(); - } - _racesNot.add(race); - } - - public List getRacesNot() - { - return _racesNot != null ? _racesNot : Collections.emptyList(); - } - - /** - * @param player the actor requesting to use this appearance. - * @param targetItem the item to be modified with this appearance. - * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. - */ - public boolean checkConditions(Player player, Item targetItem) - { - if (targetItem == null) - { - return false; - } - - if (getTargetTypes().isEmpty()) - { - return false; - } - - if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); - return false; - } - - switch (_type) - { - case RESTORE: - { - if (targetItem.getVisualId() == 0) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); - return false; - } - - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - default: - { - // Seems like in retail item with already changed appearance, can be changed again without being restored. - - final AppearanceTargetType targetType = getTargetTypes().get(0); - switch (targetType) - { - case NONE: - { - return false; - } - case WEAPON: - { - if (!targetItem.isWeapon()) - { - player.sendPacket(SystemMessageId.WEAPONS_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ARMOR: - { - if (!targetItem.isArmor()) - { - player.sendPacket(SystemMessageId.ARMOR_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ACCESSORY: - { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) - { - player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); - return false; - } - break; - } - case ALL: - { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (findVisualChange(targetItem) == null) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - return true; - } - } - break; - } - } - - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (_weaponType != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) - { - if (_weaponType != WeaponType.CROSSBOW) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - } - - switch (_handType) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - } - - switch (_magicType) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - if (_armorType != ArmorType.NONE) - { - switch (_armorType) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - return true; - } - - public AppearanceHolder findVisualChange(Item targetItem) - { - for (AppearanceHolder holder : _allVisualIds) - { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) - { - continue; - } - - if (holder.getWeaponType() != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) - { - if (holder.getWeaponType() != WeaponType.CROSSBOW) - { - continue; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - continue; - } - } - - switch (holder.getHandType()) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - continue; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - continue; - } - break; - } - } - - switch (holder.getMagicType()) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - continue; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - continue; - } - } - } - } - - if (holder.getArmorType() != ArmorType.NONE) - { - switch (holder.getArmorType()) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - continue; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - continue; - } - } - } - } - return holder; - } - return null; - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java deleted file mode 100644 index 6745b1d5e4..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ /dev/null @@ -1,212 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.logging.Logger; - -import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public abstract class AbstractEnchantItem -{ - protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); - - private static final ItemType[] ENCHANT_TYPES = new ItemType[] - { - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - EtcItemType.BLESS_ENCHT_AM, - EtcItemType.BLESS_ENCHT_AM_DOWN, - EtcItemType.BLESS_ENCHT_WP, - EtcItemType.ENCHT_AM, - EtcItemType.ENCHT_WP, - EtcItemType.ENCHT_WP_DOWN, - EtcItemType.ENCHT_AM_DOWN, - EtcItemType.GIANT_ENCHT_AM, - EtcItemType.GIANT_ENCHT_WP, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - }; - - private final int _id; - private final CrystalType _grade; - private final int _minEnchantLevel; - private final int _maxEnchantLevel; - private final int _safeEnchantLevel; - private final int _randomEnchantMin; - private final int _randomEnchantMax; - private final double _bonusRate; - - public AbstractEnchantItem(StatSet set) - { - _id = set.getInt("id"); - if (getItem() == null) - { - throw new NullPointerException(); - } - else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) - { - throw new IllegalAccessError(); - } - _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); - _minEnchantLevel = set.getInt("minEnchant", 0); - _maxEnchantLevel = set.getInt("maxEnchant", 127); - _safeEnchantLevel = set.getInt("safeEnchant", 0); - _randomEnchantMin = set.getInt("randomEnchantMin", 1); - _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); - _bonusRate = set.getDouble("bonusRate", 0); - } - - /** - * @return id of current item - */ - public int getId() - { - return _id; - } - - /** - * @return bonus chance that would be added - */ - public double getBonusRate() - { - return _bonusRate; - } - - /** - * @return {@link ItemTemplate} current item/scroll - */ - public ItemTemplate getItem() - { - return ItemTable.getInstance().getTemplate(_id); - } - - /** - * @return grade of the item/scroll. - */ - public CrystalType getGrade() - { - return _grade; - } - - /** - * @return {@code true} if scroll is for weapon, {@code false} for armor - */ - public abstract boolean isWeapon(); - - /** - * @return the minimum enchant level that this scroll/item can be used with - */ - public int getMinEnchantLevel() - { - return _minEnchantLevel; - } - - /** - * @return the maximum enchant level that this scroll/item can be used with - */ - public int getMaxEnchantLevel() - { - return _maxEnchantLevel; - } - - /** - * @return the safe enchant level of this scroll/item - */ - public int getSafeEnchant() - { - return _safeEnchantLevel; - } - - /** - * @return the minimum random enchant level of this scroll/item - */ - public int getRandomEnchantMin() - { - return _randomEnchantMin; - } - - /** - * @return the maximum random enchant level of this scroll/item - */ - public int getRandomEnchantMax() - { - return _randomEnchantMax; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem - * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise - */ - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if (itemToEnchant == null) - { - return false; - } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) - { - return false; - } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) - { - return false; - } - else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) - { - return false; - } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) - { - return false; - } - return true; - } - - /** - * @param type2 - * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise - */ - private boolean isValidItemType(int type2) - { - if (type2 == ItemTemplate.TYPE2_WEAPON) - { - return isWeapon(); - } - else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) - { - return !isWeapon(); - } - return false; - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fe698d8e2a..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private long _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(long slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java deleted file mode 100644 index f543c70ebd..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.HashSet; -import java.util.Set; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.data.xml.EnchantItemData; -import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author UnAfraid - */ -public class EnchantScroll extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isBlessedDown; - private final boolean _isSafe; - private final boolean _isGiant; - private final int _scrollGroupId; - private Set _items; - - public EnchantScroll(StatSet set) - { - super(set); - _scrollGroupId = set.getInt("scrollGroupId", 0); - - final ItemType type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN); - _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - /** - * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will reset to 0), {@code false} otherwise - */ - public boolean isBlessed() - { - return _isBlessed; - } - - /** - * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise - */ - public boolean isBlessedDown() - { - return _isBlessedDown; - } - - /** - * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise - */ - public boolean isSafe() - { - return _isSafe; - } - - public boolean isGiant() - { - return _isGiant; - } - - /** - * @return id of scroll group that should be used - */ - public int getScrollGroupId() - { - return _scrollGroupId; - } - - /** - * Enforces current scroll to use only those items as possible items to enchant - * @param itemId - */ - public void addItem(int itemId) - { - if (_items == null) - { - _items = new HashSet<>(); - } - _items.add(itemId); - } - - public Set getItems() - { - return _items; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem the support item used when enchanting (can be null) - * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise - */ - @Override - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if ((_items != null) && !_items.contains(itemToEnchant.getId())) - { - return false; - } - else if ((supportItem != null)) - { - if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed())) - { - return false; - } - else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant())) - { - return false; - } - else if (!supportItem.isValid(itemToEnchant, supportItem)) - { - return false; - } - else if (supportItem.isWeapon() != isWeapon()) - { - return false; - } - } - if (_items == null) - { - for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls()) - { - if (scroll.getId() == getId()) - { - continue; - } - final Set scrollItems = scroll.getItems(); - if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId())) - { - return false; - } - } - } - return super.isValid(itemToEnchant, supportItem); - } - - /** - * @param player - * @param enchantItem - * @return the chance of current scroll's group. - */ - public double getChance(Player player, Item enchantItem) - { - if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); - return -1; - } - - final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); - if (group == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); - return -1; - } - - if ((getSafeEnchant() > 0) && (enchantItem.getEnchantLevel() < getSafeEnchant())) - { - return 100; - } - - return group.getChance(enchantItem.getEnchantLevel()); - } - - /** - * @param player - * @param enchantItem - * @param supportItem - * @return the total chance for success rate of this scroll - */ - public EnchantResultType calculateSuccess(Player player, Item enchantItem, EnchantSupportItem supportItem) - { - if (!isValid(enchantItem, supportItem)) - { - return EnchantResultType.ERROR; - } - - final double chance = getChance(player, enchantItem); - if (chance == -1) - { - return EnchantResultType.ERROR; - } - - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); - final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; - final double bonusRate = getBonusRate(); - final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; - final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100); - final double random = 100 * Rnd.nextDouble(); - final boolean success = (random < finalChance) || player.tryLuck(); - return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE; - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java deleted file mode 100644 index 12b33e468f..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public class EnchantSupportItem extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isDown; - private final boolean _isGiant; - private final ItemType type; - - public EnchantSupportItem(StatSet set) - { - super(set); - type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.ENCHT_WP_DOWN) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isDown = (type == EtcItemType.ENCHT_AM_DOWN) || (type == EtcItemType.ENCHT_WP_DOWN); - _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - public boolean isBlessed() - { - return _isBlessed; - } - - public boolean isDown() - { - return _isDown; - } - - public boolean isGiant() - { - return _isGiant; - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java deleted file mode 100644 index 5730665d9f..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * EtcItem Type enumerated. - */ -public enum EtcItemType implements ItemType -{ - NONE, - SCROLL, - ARROW, - POTION, - SPELLBOOK, - RECIPE, - MATERIAL, - PET_COLLAR, - CASTLE_GUARD, - DYE, - SEED, - SEED2, - HARVEST, - LOTTO, - RACE_TICKET, - TICKET_OF_LORD, - LURE, - CROP, - MATURECROP, - ENCHT_WP, - ENCHT_AM, - ENCHT_AM_DOWN, - ENCHT_WP_DOWN, - GIANT_ENCHT_WP, - GIANT_ENCHT_AM, - BLESS_ENCHT_WP, - BLESS_ENCHT_AM, - BLESS_ENCHT_AM_DOWN, - COUPON, - ELIXIR, - ENCHT_ATTR, - ENCHT_ATTR_CURSED, - BOLT, - ENCHT_ATTR_INC_PROP_ENCHT_WP, - ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_RUNE, - ENCHT_ATTRT_RUNE_SELECT, - TELEPORTBOOKMARK, - CHANGE_ATTR, - SOULSHOT, - SHAPE_SHIFTING_WP, - BLESS_SHAPE_SHIFTING_WP, - SHAPE_SHIFTING_WP_FIXED, - SHAPE_SHIFTING_AM, - BLESS_SHAPE_SHIFTING_AM, - SHAPE_SHIFTING_AM_FIXED, - SHAPE_SHIFTING_HAIRACC, - BLESS_SHAPE_SHIFTING_HAIRACC, - SHAPE_SHIFTING_HAIRACC_FIXED, - RESTORE_SHAPE_SHIFTING_WP, - RESTORE_SHAPE_SHIFTING_AM, - RESTORE_SHAPE_SHIFTING_HAIRACC, - RESTORE_SHAPE_SHIFTING_ALLITEM, - BLESS_INC_PROP_ENCHT_WP, - BLESS_INC_PROP_ENCHT_AM, - CARD_EVENT, - SHAPE_SHIFTING_ALLITEM_FIXED, - MULTI_ENCHT_WP, - MULTI_ENCHT_AM, - MULTI_INC_PROB_ENCHT_WP, - MULTI_INC_PROB_ENCHT_AM, - SOUL_CRYSTAL, - ENSOUL_STONE; - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return 0; - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c807e1298e..0fcb8c33e4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index a43b3964d6..b98f055fe3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/Quest.java index fd9165366d..20fbb1cd5f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -65,8 +65,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/Skill.java index dde442a756..269f26165b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 31a40afaff..1309abaea2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java index f6cdf4df7f..80b0c140b1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index da2c567d17..a99ddb2dfe 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 402c603dac..645156f9c1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ee53743fce..31df739b0f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index c37fedbfb8..068f5c9368 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index ef63d53ef4..0546560e58 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 3eda159a36..c524cb94f1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index ddbf6666c9..c4b2ee6602 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index 45301710ad..e9fb2b0c78 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index e3239d2fe1..37d6a07943 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 557445c4cd..04e9c002c2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 3c8e441156..8548ad1d3a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index cfb6455ad0..31d29ef3dd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 8513b4d0da..1872b6fa54 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -42,8 +42,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 0747b4eb2b..1683715324 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -53,10 +53,10 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 8aa685657e..8ff8d6ef9a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index cb0801a8d5..f8d8826556 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index d6df3726cc..47214311ac 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 0d59d2ff65..e8d7efa6b0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1963944528..15841de161 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 2ca0f283f9..4f351a636b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 6cc03e2c2b..48cdb8e80b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index c956d365f1..a41b731353 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 3cee24bfb0..161b8d0cab 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index ffd0ffbb36..67a4813cec 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java index 3d7c93c85c..c9b6d4dd3a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java @@ -22,8 +22,8 @@ import java.util.Set; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExTryEnchantArtifactResult; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 29f7828f27..a9fd8d923a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 12bc7c708d..79e1193ac0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 8a5f549b6f..5d9ff7b557 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 4759ba7fda..f511a8e30d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 1dca606dcd..36256ab955 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 18485fdbd4..4d3adf25dc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 989d2e582f..2c715b4efb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d7fcffbdb5..4468b67642 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index fca793bdc0..776e7f818f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 95512364b3..bba86e4e86 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 8ac47eea12..5364e67986 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index cb16d5cc7d..cd8e900014 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index de4094b252..db5981de3d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 8bbb0f99ff..899777642d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 61920f471b..f89be1cfcb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 8a2a0b5033..1b5eb14605 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 17fa6aeaf2..f02aaa9ace 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index e054f0f722..65d55dac0c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -38,10 +38,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 940b213621..d9a7fcb4cb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 6800a418cc..d257cb06cc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AlchemyResult; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index f144094dda..95a85c269b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java index 1fc0400b59..eafc924a43 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.ActionDataHolder; import org.l2jmobius.gameserver.model.ShortCuts; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java index 9326803882..b602edf72b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.CollectionDataHolder; import org.l2jmobius.gameserver.model.holders.ItemCollectionData; import org.l2jmobius.gameserver.model.holders.PlayerCollectionData; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 80d2ecee11..e5c25df330 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index d8e28130cc..9cc69554c4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 0b67368833..53112870da 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index 08705b38da..f926d90210 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 7ed7806afb..8562dc024b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 03e1f539c4..ac6b8358d4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index e8f3c75825..912dae684a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 25c9792ec1..3220827fbb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusInitPoint.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusInitPoint.java index 81cd4756f2..d907ed3377 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusInitPoint.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusInitPoint.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.homunculus; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index 0e95eb9b89..cdaefbe360 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51cd76618e..af8b12547e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 626ba1c351..f143a8aec9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 61fd93e55c..6063a54535 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index df2409c89e..0fc5fb1c75 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index 5a7a9c9c3b..a0ba15da9f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.holders.DamageTakenHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 12359bcd17..2cea176d69 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 93588924fe..077f33cb49 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 07725028a6..76375a86f7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c5c1d1141..81a384642c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index e4fb9e4160..b65005003d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 51abfa9d3e..f49138fafe 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 809a864983..395487097c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 2fe9967302..30dc837721 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 6691a8ea4f..cf3d83263f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 97b7b53cae..cb1379ac29 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index f826c75d4b..844fad86c7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index bd768c74e2..c4598a72e6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index c94eae4c08..00d7618d34 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ced39204d3..fbb5c84dfe 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4068629bde..d05590cbde 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 0e6211e63b..358ee2361b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index d48b66c6ef..9d9b24a54f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c742d534c4..c59568bf1d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index a22b36335e..35ca986d35 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 271ec4401b..37150ec357 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java index db11b2a9b4..d4351a66f9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 6b8cd1358f..c32d4f7c04 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index ca4e7b7f5f..c1b8163a93 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro; /** diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 7553a3233e..fb0db44e8e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Guard; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/DocumentBase.java index c009919c53..7376c5da59 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -136,9 +139,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java index e525165bcb..38cb684c22 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChangeToAwakenedClass; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/DragonWeaponListeners.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/DragonWeaponListeners.java index 09171d6d97..c50af03d70 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/DragonWeaponListeners.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/DragonWeaponListeners.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemEquip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import ai.AbstractNpcAI; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java index e7cfdef238..adf66d2a8a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExGetPremiumItemList; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/SiegeGuards.java index 07d6a45613..ea67a6b16c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 418ed93b2a..4081019df2 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 5c3d6867a2..1e08a1f98d 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index a53c69fb80..680745b29d 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 5b1db54836..e7113941ec 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index f73f3c2e73..5d3caadfd5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 0a82f9968d..35d31315ad 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 707e9387d1..8ab335bc8b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 58e28495eb..042ba14139 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHomunculusPoints.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHomunculusPoints.java index de6eeec586..19de566273 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHomunculusPoints.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHomunculusPoints.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index ef698d3144..98c614b7e5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 59e5b148a1..76d08b7a2b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index e1681d19a4..8e1d2e4ebd 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index f7054e99e9..17d76b1bf6 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index 1d104a4069..bb6ed54b11 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index 54c02363b2..fa74c5a8fb 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index c5a58222c9..81749c89a6 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 19226dce0f..6cd820aedf 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index ab33e22a5f..adc092f771 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 31621251be..62d5debb32 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index fae553ff45..991d2217b5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java index 30151c2b58..69cedcca0c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DecreaseWaitingTime.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusBirthInfo; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 7d0f0b43ba..9723633d69 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 437b502a95..b8985f0fef 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 277a03c294..c98e55ac10 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java index 2e2e322e86..6183d5637e 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DispelCaster.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index bfc65e27f5..879983272a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index d592bba597..96b98f6548 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index aa2eabd231..5690696b29 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 705ed225aa..a74d84251f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index ebbd33bda0..f952b58fa2 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Heal.java index d480511447..c69477f113 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index ecebff8fcf..bbe94f05d2 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index d55c2897df..a58e246a0d 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java index 06f3fb2e45..4e0e25e56f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 8f81770a04..53f0529429 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index af19b2276d..ded8b9bcbc 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.RecipeBookItemList; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 7e60c89db5..2ca2c2fc70 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 6a58fbf31b..f4ff6be84c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java index 30b8b4d117..b5739976ad 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReplaceSkillBySkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index c84a1eef1c..dc98162c19 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java index d43c368f7c..1d227df4d5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestoreSymbolSeal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b485046a39..25c237e53f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 83860039e2..a22aaf477d 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java index 0767b28991..6c95915b62 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java index 8c1be275c7..200a0cc1fd 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index 5461a0259e..7b898d2461 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index d21bbf334e..ff11355aa7 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index ba621c653f..f553a0c846 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 9b16668969..119fe1f81e 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 669c6bd362..604b134414 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index f45a96746c..7d8ad117db 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index e1384fe3e2..b527922050 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java index c835ed0702..7976256d7f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/PaulinasSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 4db0961a07..416fa8a65a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index c6d8ec7a1b..1f44066740 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 98ae8c4eaf..353347df87 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index ff9e654e61..3aeadd38a7 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/TeleportCube.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/TeleportCube.java index 43078b25dd..7d01936f04 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/TeleportCube.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/TeleportCube.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import quests.Q10589_WhereFatesIntersect.Q10589_WhereFatesIntersect; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index f40ab6c057..ab5ba58a10 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java index faa49497bf..3dd42f74db 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/ItemTable.java index 5fdb316882..439c38d1e5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -48,12 +48,12 @@ import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.AmmunitionSkillList; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index d508b71aef..fd2a491d66 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 0f8815bcc4..475f0085d8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index a213d965da..cab4dfa0e9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java index 426e9dd06f..6c261d6ded 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ClanShopData.java @@ -27,7 +27,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ClanShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/CollectionData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/CollectionData.java index 40504de824..baf3bcf2b8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/CollectionData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/CollectionData.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.CollectionDataHolder; import org.l2jmobius.gameserver.model.holders.ItemCollectionData; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Written by Berezkin Nikolay, on 04.05.2021 diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index 1966613539..294a8b45f6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index cc0f4afb20..f7568ac960 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author Mobius diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java index 624a8754f5..9644699cc0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.LimitShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius, GustavoFonseca diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java index 11000be2bb..826ff206e4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.LimitShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 3f7c8ab166..02089dc8c1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/VariationData.java index 392612cd2d..c29a10baa2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index 1b5d73308d..4ed0600683 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/ItemGrade.java index ad9e39c36d..11ea4c3bd8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 557c5e108a..48a6f07b3c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index efa12b90bc..662dbf7c39 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index ce03808800..7799768d15 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ArmorSet.java index 9aa27bc064..14226149e5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CombatFlag.java index e726f912f1..e0487f9079 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CursedWeapon.java index d9dd1c9b65..2301aacbc4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Party.java index 12321a158f..1bd1eeb1cc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Party.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Seed.java index 13caeeb575..2dc7f967bb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java index d199976edc..a9fd529ecc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TradeList.java index bbafcb1416..bea714862c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0eca80504c..e3f680ef86 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -63,8 +63,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java index c60942df43..1402dccb4b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java index 573163b747..f7b00eb570 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 5e785bbfc7..5454eeb149 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -239,21 +239,21 @@ import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.homunculus.HomunculusList; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Summon.java index 4eb006b5f2..5c0f977ccc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 70166bae98..cdbe566796 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 4da5b23f77..02b8e77771 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index 3594c14845..5672633fc9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; public class PlayableStat extends CreatureStat diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index aae970603a..e296ba2cca 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SubClassHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index da03c6b165..d93e4def4d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 0190272650..df278a30d8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionMaximumVitalityPoints.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionMaximumVitalityPoints.java index 5e2d332711..f395f4581b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionMaximumVitalityPoints.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionMaximumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9c053efc5e..ebe8b7499f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 5b4ab6daf1..d68a40ee75 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 85c89d15ec..4c9bc6856c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 68990650dd..c08b648e55 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java index 58bd23cf07..5edfafb200 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSymbolSealPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index a5fea7c6f6..347f281026 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 2f1424657f..b5b9ac8025 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -132,15 +132,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java index f65fcabe54..e0317b1c0a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemAttributeAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java index 780dbd83e4..51ec6c9e3d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemEnchantAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java index 81e8c9eb16..bf1d1237f1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemSoulCrystalAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NightBR diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index af538045b8..d391a4faf1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 79c69f739d..41f554b9e0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index b86121305d..b18ff0fce9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java index d01b97cc2c..fcd3b7c0ba 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/ClanShopProductHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.model.TradeItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/Armor.java index d11c43f9cc..f65945c191 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/Henna.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/Henna.java new file mode 100644 index 0000000000..0d1de91388 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -0,0 +1,183 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; + +/** + * Class for the Henna object. + * @author Zoey76 + */ +public class Henna +{ + private final int _dyeId; + private final int _dyeItemId; + private final boolean _isPremium; + private final Map _baseStats = new EnumMap<>(BaseStat.class); + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final int _duration; + private final List _skills; + private final List _wearClass; + + public Henna(StatSet set) + { + _dyeId = set.getInt("dyeId"); + _dyeItemId = set.getInt("dyeItemId"); + _isPremium = set.getBoolean("isPremium", false); + _baseStats.put(BaseStat.STR, set.getInt("str", 0)); + _baseStats.put(BaseStat.CON, set.getInt("con", 0)); + _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); + _baseStats.put(BaseStat.INT, set.getInt("int", 0)); + _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); + _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); + _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); + _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _duration = set.getInt("duration", -1); + _skills = new ArrayList<>(); + _wearClass = new ArrayList<>(); + } + + /** + * @return the dye Id. + */ + public int getDyeId() + { + return _dyeId; + } + + /** + * @return the item Id, required for this dye. + */ + public int getDyeItemId() + { + return _dyeItemId; + } + + /** + * @return true if this dye is premium. + */ + public boolean isPremium() + { + return _isPremium; + } + + public int getBaseStats(BaseStat stat) + { + return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); + } + + public Map getBaseStats() + { + return _baseStats; + } + + /** + * @return the wear fee, cost for adding this dye to the player. + */ + public int getWearFee() + { + return _wearFee; + } + + /** + * @return the wear count, the required count to add this dye to the player. + */ + public int getWearCount() + { + return _wearCount; + } + + /** + * @return the cancel fee, cost for removing this dye from the player. + */ + public int getCancelFee() + { + return _cancelFee; + } + + /** + * @return the cancel count, the retrieved amount of dye items after removing the dye. + */ + public int getCancelCount() + { + return _cancelCount; + } + + /** + * @return the duration of this dye. + */ + public int getDuration() + { + return _duration; + } + + /** + * @param skillList the list of skills related to this dye. + */ + public void setSkills(List skillList) + { + _skills.addAll(skillList); + } + + /** + * @return the skills related to this dye. + */ + public List getSkills() + { + return _skills; + } + + /** + * @return the list with the allowed classes to wear this dye. + */ + public List getAllowedWearClass() + { + return _wearClass; + } + + /** + * @param classId the class trying to wear this dye. + * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. + */ + public boolean isAllowedClass(ClassId classId) + { + return _wearClass.contains(classId); + } + + /** + * @param wearClassIds the list of classes that can wear this dye. + */ + public void setWearClassIds(List wearClassIds) + { + _wearClass.addAll(wearClassIds); + } +} \ No newline at end of file diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java new file mode 100644 index 0000000000..4b205f2acf --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -0,0 +1,1081 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.EnumMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Consumer; +import java.util.function.Predicate; +import java.util.logging.Logger; + +import org.l2jmobius.Config; +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.AttributeType; +import org.l2jmobius.gameserver.enums.ItemGrade; +import org.l2jmobius.gameserver.enums.ItemSkillType; +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.PlayerCondOverride; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.WorldObject; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.commission.CommissionItemType; +import org.l2jmobius.gameserver.model.conditions.Condition; +import org.l2jmobius.gameserver.model.events.ListenersContainer; +import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; +import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; +import org.l2jmobius.gameserver.model.stats.Stat; +import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; +import org.l2jmobius.gameserver.model.stats.functions.FuncSet; +import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; + +/** + * This class contains all informations concerning the item (weapon, armor, etc).
+ * Mother class of : + *
    + *
  • Armor
    • + *
  • EtcItem
    • + *
  • Weapon
    • + *
+ */ +public abstract class ItemTemplate extends ListenersContainer implements IIdentifiable +{ + protected static final Logger LOGGER = Logger.getLogger(ItemTemplate.class.getName()); + + public static final int TYPE1_WEAPON_RING_EARRING_NECKLACE = 0; + public static final int TYPE1_SHIELD_ARMOR = 1; + public static final int TYPE1_ITEM_QUESTITEM_ADENA = 4; + + public static final int TYPE2_WEAPON = 0; + public static final int TYPE2_SHIELD_ARMOR = 1; + public static final int TYPE2_ACCESSORY = 2; + public static final int TYPE2_QUEST = 3; + public static final int TYPE2_MONEY = 4; + public static final int TYPE2_OTHER = 5; + + public static final int SLOT_NONE = 0x0000; + public static final int SLOT_UNDERWEAR = 0x0001; + public static final int SLOT_R_EAR = 0x0002; + public static final int SLOT_L_EAR = 0x0004; + public static final int SLOT_LR_EAR = 0x00006; + public static final int SLOT_NECK = 0x0008; + public static final int SLOT_R_FINGER = 0x0010; + public static final int SLOT_L_FINGER = 0x0020; + public static final int SLOT_LR_FINGER = 0x0030; + public static final int SLOT_HEAD = 0x0040; + public static final int SLOT_R_HAND = 0x0080; + public static final int SLOT_L_HAND = 0x0100; + public static final int SLOT_GLOVES = 0x0200; + public static final int SLOT_CHEST = 0x0400; + public static final int SLOT_LEGS = 0x0800; + public static final int SLOT_FEET = 0x1000; + public static final int SLOT_BACK = 0x2000; + public static final int SLOT_LR_HAND = 0x4000; + public static final int SLOT_FULL_ARMOR = 0x8000; + public static final int SLOT_HAIR = 0x010000; + public static final int SLOT_ALLDRESS = 0x020000; + public static final int SLOT_HAIR2 = 0x040000; + public static final int SLOT_HAIRALL = 0x080000; + public static final int SLOT_R_BRACELET = 0x100000; + public static final int SLOT_L_BRACELET = 0x200000; + public static final int SLOT_DECO = 0x400000; + public static final int SLOT_BELT = 0x10000000; + public static final int SLOT_BROOCH = 0x20000000; + public static final int SLOT_BROOCH_JEWEL = 0x40000000; + public static final long SLOT_AGATHION = 0x3000000000L; + public static final long SLOT_ARTIFACT_BOOK = 0x20000000000L; + public static final long SLOT_ARTIFACT = 0x40000000000L; + + public static final int SLOT_WOLF = -100; + public static final int SLOT_HATCHLING = -101; + public static final int SLOT_STRIDER = -102; + public static final int SLOT_BABYPET = -103; + public static final int SLOT_GREATWOLF = -104; + + public static final int SLOT_MULTI_ALLWEAPON = SLOT_LR_HAND | SLOT_R_HAND; + + private int _itemId; + private int _displayId; + private String _name; + private String _additionalName; + private String _icon; + private int _weight; + private boolean _stackable; + private MaterialType _materialType; + private CrystalType _crystalType; + private int _equipReuseDelay; + private int _duration; + private long _time; + private int _autoDestroyTime; + private long _bodyPart; + private long _referencePrice; + private int _crystalCount; + private boolean _sellable; + private boolean _dropable; + private boolean _destroyable; + private boolean _tradeable; + private boolean _depositable; + private boolean _enchantable; + private int _enchantLimit; + private boolean _elementable; + private boolean _questItem; + private boolean _freightable; + private boolean _allowSelfResurrection; + private boolean _isOlyRestricted; + private boolean _isEventRestricted; + private boolean _forNpc; + private boolean _common; + private boolean _heroItem; + private boolean _pvpItem; + private boolean _immediateEffect; + private boolean _exImmediateEffect; + private int _defaultEnchantLevel; + private ActionType _defaultAction; + + protected int _type1; // needed for item list (inventory) + protected int _type2; // different lists for armor, weapon, etc + private Map _elementals = null; + protected Map _funcTemplates; + protected List _preConditions; + private List _skills; + + private int _useSkillDisTime; + private int _reuseDelay; + private int _sharedReuseGroup; + + private CommissionItemType _commissionItemType; + + private boolean _isAppearanceable; + private boolean _isBlessed; + + private int _artifactSlot; + + /** + * Constructor of the Item that fill class variables. + * @param set : StatSet corresponding to a set of couples (key,value) for description of the item + */ + protected ItemTemplate(StatSet set) + { + set(set); + } + + public void set(StatSet set) + { + _itemId = set.getInt("item_id"); + _displayId = set.getInt("displayId", _itemId); + _name = set.getString("name"); + _additionalName = set.getString("additionalName", null); + _icon = set.getString("icon", null); + _weight = set.getInt("weight", 0); + _materialType = set.getEnum("material", MaterialType.class, MaterialType.STEEL); + _equipReuseDelay = set.getInt("equip_reuse_delay", 0) * 1000; + _duration = set.getInt("duration", -1); + _time = set.getInt("time", -1); + _autoDestroyTime = set.getInt("auto_destroy_time", -1) * 1000; + _bodyPart = ItemTable.SLOTS.get(set.getString("bodypart", "none")); + _referencePrice = set.getLong("price", 0); + _crystalType = set.getEnum("crystal_type", CrystalType.class, CrystalType.NONE); + _crystalCount = set.getInt("crystal_count", 0); + _stackable = set.getBoolean("is_stackable", false); + _sellable = set.getBoolean("is_sellable", true); + _dropable = set.getBoolean("is_dropable", true); + _destroyable = set.getBoolean("is_destroyable", true); + _tradeable = set.getBoolean("is_tradable", true); + _questItem = set.getBoolean("is_questitem", false); + if (Config.CUSTOM_DEPOSITABLE_ENABLED) + { + _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; + } + else + { + _depositable = set.getBoolean("is_depositable", true); + } + + _elementable = set.getBoolean("element_enabled", false); + _enchantable = set.getBoolean("enchant_enabled", false); + _enchantLimit = set.getInt("enchant_limit", 0); + _freightable = set.getBoolean("is_freightable", false); + _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); + _isOlyRestricted = set.getBoolean("is_oly_restricted", false); + _isEventRestricted = set.getBoolean("is_event_restricted", false); + _forNpc = set.getBoolean("for_npc", false); + _isAppearanceable = set.getBoolean("isAppearanceable", false); + _isBlessed = set.getBoolean("blessed", false); + _artifactSlot = set.getInt("artifactSlot", 0); + _immediateEffect = set.getBoolean("immediate_effect", false); + _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); + _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); + _useSkillDisTime = set.getInt("useSkillDisTime", 0); + _defaultEnchantLevel = set.getInt("enchanted", 0); + _reuseDelay = set.getInt("reuse_delay", 0); + _sharedReuseGroup = set.getInt("shared_reuse_group", 0); + _commissionItemType = set.getEnum("commissionItemType", CommissionItemType.class, CommissionItemType.OTHER_ITEM); + _common = ((_itemId >= 11605) && (_itemId <= 12361)); + _heroItem = ((_itemId >= 6611) && (_itemId <= 6621)) || ((_itemId >= 9388) && (_itemId <= 9390)) || (_itemId == 6842); + _pvpItem = ((_itemId >= 10667) && (_itemId <= 10835)) || ((_itemId >= 12852) && (_itemId <= 12977)) || ((_itemId >= 14363) && (_itemId <= 14525)) || (_itemId == 14528) || (_itemId == 14529) || (_itemId == 14558) || ((_itemId >= 15913) && (_itemId <= 16024)) || ((_itemId >= 16134) && (_itemId <= 16147)) || (_itemId == 16149) || (_itemId == 16151) || (_itemId == 16153) || (_itemId == 16155) || (_itemId == 16157) || (_itemId == 16159) || ((_itemId >= 16168) && (_itemId <= 16176)) || ((_itemId >= 16179) && (_itemId <= 16220)) || ((_itemId >= 21932) && (_itemId <= 21934)) || (_itemId == 21938) || ((_itemId >= 21952) && (_itemId <= 21954)) || (_itemId == 21958) || ((_itemId >= 21970) && (_itemId <= 21972)); + } + + /** + * Returns the itemType. + * @return Enum + */ + public abstract ItemType getItemType(); + + /** + * Verifies if the item is an etc item. + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + public boolean isEtcItem() + { + return false; + } + + /** + * Verifies if the item is an armor. + * @return {@code true} if the item is an armor, {@code false} otherwise. + */ + public boolean isArmor() + { + return false; + } + + /** + * Verifies if the item is a weapon. + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + public boolean isWeapon() + { + return false; + } + + /** + * Verifies if the item is a magic weapon. + * @return {@code true} if the weapon is magic, {@code false} otherwise. + */ + public boolean isMagicWeapon() + { + return false; + } + + /** + * @return the _equipReuseDelay + */ + public int getEquipReuseDelay() + { + return _equipReuseDelay; + } + + /** + * Returns the duration of the item + * @return int + */ + public int getDuration() + { + return _duration; + } + + /** + * Returns the time of the item + * @return long + */ + public long getTime() + { + return _time; + } + + /** + * @return the auto destroy time of the item in seconds: 0 or less - default + */ + public int getAutoDestroyTime() + { + return _autoDestroyTime; + } + + /** + * Returns the ID of the item + * @return int + */ + @Override + public int getId() + { + return _itemId; + } + + /** + * Returns the ID of the item + * @return int + */ + public int getDisplayId() + { + return _displayId; + } + + public abstract int getItemMask(); + + /** + * Return the type of material of the item + * @return MaterialType + */ + public MaterialType getMaterialType() + { + return _materialType; + } + + /** + * Returns the type 2 of the item + * @return int + */ + public int getType2() + { + return _type2; + } + + /** + * Returns the weight of the item + * @return int + */ + public int getWeight() + { + return _weight; + } + + /** + * Returns if the item is crystallizable + * @return boolean + */ + public boolean isCrystallizable() + { + return (_crystalType != CrystalType.NONE) && (_crystalCount > 0); + } + + /** + * @return return General item grade (No S80, S84, R95, R99) + */ + public ItemGrade getItemGrade() + { + return ItemGrade.valueOf(_crystalType); + } + + /** + * Return the type of crystal if item is crystallizable + * @return CrystalType + */ + public CrystalType getCrystalType() + { + return _crystalType; + } + + /** + * Return the ID of crystal if item is crystallizable + * @return int + */ + public int getCrystalItemId() + { + return _crystalType.getCrystalId(); + } + + /** + * For grades S80 and S84 return S, R95, and R99 return R + * @return the grade of the item. + */ + public CrystalType getCrystalTypePlus() + { + switch (_crystalType) + { + case S80: + case S84: + { + return CrystalType.S; + } + case R95: + case R99: + case R110: + { + return CrystalType.R; + } + default: + { + return _crystalType; + } + } + } + + /** + * @return the quantity of crystals for crystallization. + */ + public int getCrystalCount() + { + return _crystalCount; + } + + /** + * @param enchantLevel + * @return the quantity of crystals for crystallization on specific enchant level + */ + public int getCrystalCount(int enchantLevel) + { + if (enchantLevel > 3) + { + switch (_type2) + { + case TYPE2_SHIELD_ARMOR: + case TYPE2_ACCESSORY: + { + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); + } + case TYPE2_WEAPON: + { + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); + } + default: + { + return _crystalCount; + } + } + } + else if (enchantLevel > 0) + { + switch (_type2) + { + case TYPE2_SHIELD_ARMOR: + case TYPE2_ACCESSORY: + { + return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * enchantLevel); + } + case TYPE2_WEAPON: + { + return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * enchantLevel); + } + default: + { + return _crystalCount; + } + } + } + else + { + return _crystalCount; + } + } + + /** + * @return the name of the item. + */ + public String getName() + { + return _name; + } + + /** + * @return the item's additional name. + */ + public String getAdditionalName() + { + return _additionalName; + } + + public Collection getAttributes() + { + return _elementals != null ? _elementals.values() : null; + } + + public AttributeHolder getAttribute(AttributeType type) + { + return _elementals != null ? _elementals.get(type) : null; + } + + /** + * Sets the base elemental of the item. + * @param holder the element to set. + */ + public void setAttributes(AttributeHolder holder) + { + if (_elementals == null) + { + _elementals = new LinkedHashMap<>(3); + _elementals.put(holder.getType(), holder); + } + else + { + final AttributeHolder attribute = getAttribute(holder.getType()); + if (attribute != null) + { + attribute.setValue(holder.getValue()); + } + else + { + _elementals.put(holder.getType(), holder); + } + } + } + + /** + * @return the part of the body used with the item. + */ + public long getBodyPart() + { + return _bodyPart; + } + + /** + * @return the type 1 of the item. + */ + public int getType1() + { + return _type1; + } + + /** + * @return {@code true} if the item is stackable, {@code false} otherwise. + */ + public boolean isStackable() + { + return _stackable; + } + + /** + * @return {@code true} if the item can be equipped, {@code false} otherwise. + */ + public boolean isEquipable() + { + return (_bodyPart != 0) && !(getItemType() instanceof EtcItemType); + } + + /** + * @return the price of reference of the item. + */ + public long getReferencePrice() + { + return _referencePrice; + } + + /** + * @return {@code true} if the item can be sold, {@code false} otherwise. + */ + public boolean isSellable() + { + return _sellable; + } + + /** + * @return {@code true} if the item can be dropped, {@code false} otherwise. + */ + public boolean isDropable() + { + return _dropable; + } + + /** + * @return {@code true} if the item can be destroyed, {@code false} otherwise. + */ + public boolean isDestroyable() + { + return _destroyable; + } + + /** + * @return {@code true} if the item can be traded, {@code false} otherwise. + */ + public boolean isTradeable() + { + return _tradeable; + } + + /** + * @return {@code true} if the item can be put into warehouse, {@code false} otherwise. + */ + public boolean isDepositable() + { + return _depositable; + } + + /** + * This method also check the enchant blacklist. + * @return {@code true} if the item can be enchanted, {@code false} otherwise. + */ + public boolean isEnchantable() + { + return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; + } + + /** + * Returns the enchantment limit of the item + * @return int + */ + public int getEnchantLimit() + { + return _enchantLimit > 0 ? _enchantLimit : 0; + } + + /** + * @return {@code true} if the item can be elemented, {@code false} otherwise. + */ + public boolean isElementable() + { + return _elementable; + } + + /** + * Returns if item is common + * @return boolean + */ + public boolean isCommon() + { + return _common; + } + + /** + * Returns if item is hero-only + * @return + */ + public boolean isHeroItem() + { + return _heroItem; + } + + /** + * Returns if item is pvp + * @return + */ + public boolean isPvpItem() + { + return _pvpItem; + } + + public boolean isPotion() + { + return getItemType() == EtcItemType.POTION; + } + + public boolean isElixir() + { + return getItemType() == EtcItemType.ELIXIR; + } + + public boolean isScroll() + { + return getItemType() == EtcItemType.SCROLL; + } + + /** + * Add the FuncTemplate f to the list of functions used with the item + * @param template : FuncTemplate to add + */ + public void addFunctionTemplate(FuncTemplate template) + { + switch (template.getStat()) + { + case FIRE_RES: + case FIRE_POWER: + { + setAttributes(new AttributeHolder(AttributeType.FIRE, (int) template.getValue())); + break; + } + case WATER_RES: + case WATER_POWER: + { + setAttributes(new AttributeHolder(AttributeType.WATER, (int) template.getValue())); + break; + } + case WIND_RES: + case WIND_POWER: + { + setAttributes(new AttributeHolder(AttributeType.WIND, (int) template.getValue())); + break; + } + case EARTH_RES: + case EARTH_POWER: + { + setAttributes(new AttributeHolder(AttributeType.EARTH, (int) template.getValue())); + break; + } + case HOLY_RES: + case HOLY_POWER: + { + setAttributes(new AttributeHolder(AttributeType.HOLY, (int) template.getValue())); + break; + } + case DARK_RES: + case DARK_POWER: + { + setAttributes(new AttributeHolder(AttributeType.DARK, (int) template.getValue())); + break; + } + } + + if (_funcTemplates == null) + { + _funcTemplates = new EnumMap<>(Stat.class); + } + if (_funcTemplates.put(template.getStat(), template) != null) + { + LOGGER.warning("Item with id " + _itemId + " has 2 func templates with same stat: " + template.getStat()); + } + } + + public void attachCondition(Condition c) + { + if (_preConditions == null) + { + _preConditions = new ArrayList<>(); + } + _preConditions.add(c); + } + + public List getConditions() + { + return _preConditions; + } + + public boolean hasSkills() + { + return _skills != null; + } + + /** + * Method to retrieve skills linked to this item armor and weapon: passive skills etcitem: skills used on item use <-- ??? + * @return Skills linked to this item as SkillHolder[] + */ + public List getAllSkills() + { + return _skills; + } + + /** + * @param condition + * @return {@code List} of {@link ItemSkillHolder} if item has skills and matches the condition, {@code null} otherwise + */ + public List getSkills(Predicate condition) + { + if (_skills == null) + { + return null; + } + + final List result = new ArrayList<>(); + for (ItemSkillHolder skill : _skills) + { + if (condition.test(skill)) + { + result.add(skill); + } + } + return result; + } + + /** + * @param type + * @return {@code List} of {@link ItemSkillHolder} if item has skills, {@code null} otherwise + */ + public List getSkills(ItemSkillType type) + { + if (_skills == null) + { + return null; + } + + final List result = new ArrayList<>(); + for (ItemSkillHolder skill : _skills) + { + if (skill.getType() == type) + { + result.add(skill); + } + } + return result; + } + + /** + * Executes the action on each item skill with the specified type (If there are skills at all) + * @param type + * @param action + */ + public void forEachSkill(ItemSkillType type, Consumer action) + { + if (_skills != null) + { + for (ItemSkillHolder skill : _skills) + { + if (skill.getType() == type) + { + action.accept(skill); + } + } + } + } + + public void addSkill(ItemSkillHolder holder) + { + // Agathion skills managed by AgathionData. + // if ((getBodyPart() == SLOT_AGATHION) && (holder.getType() != ItemSkillType.ON_EQUIP) && (holder.getType() != ItemSkillType.ON_UNEQUIP)) + // { + // LOGGER.warning("Remove from agathion " + _itemId + " " + holder + "!"); + // return; + // } + + if (_skills == null) + { + _skills = new ArrayList<>(); + } + _skills.add(holder); + } + + public boolean checkCondition(Creature creature, WorldObject object, boolean sendMessage) + { + if (creature.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !Config.GM_ITEM_RESTRICTION) + { + return true; + } + + // Don't allow hero equipment and restricted items during Olympiad + if ((isOlyRestrictedItem() || _heroItem) && (creature.isPlayer() && creature.getActingPlayer().isInOlympiadMode())) + { + if (isEquipable()) + { + creature.sendPacket(SystemMessageId.YOU_CANNOT_EQUIP_THAT_ITEM_IN_A_OLYMPIAD_MATCH); + } + else + { + creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_OLYMPIAD_MATCH); + } + return false; + } + + if (_isEventRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent()))) + { + creature.sendMessage("You cannot use this item in the event."); + return false; + } + + if (!isConditionAttached()) + { + return true; + } + + final Creature target = object.isCreature() ? (Creature) object : null; + for (Condition preCondition : _preConditions) + { + if (preCondition == null) + { + continue; + } + + if (!preCondition.test(creature, target, null, null)) + { + if (creature.isSummon()) + { + creature.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); + return false; + } + + if (sendMessage) + { + final String msg = preCondition.getMessage(); + final int msgId = preCondition.getMessageId(); + if (msg != null) + { + creature.sendMessage(msg); + } + else if (msgId != 0) + { + final SystemMessage sm = new SystemMessage(msgId); + if (preCondition.isAddName()) + { + sm.addItemName(_itemId); + } + creature.sendPacket(sm); + } + } + return false; + } + } + return true; + } + + public boolean isConditionAttached() + { + return (_preConditions != null) && !_preConditions.isEmpty(); + } + + public boolean isQuestItem() + { + return _questItem; + } + + public boolean isFreightable() + { + return _freightable; + } + + public boolean isAllowSelfResurrection() + { + return _allowSelfResurrection; + } + + public boolean isOlyRestrictedItem() + { + return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); + } + + /** + * @return {@code true} if item cannot be used in event games. + */ + public boolean isEventRestrictedItem() + { + return _isEventRestricted; + } + + public boolean isForNpc() + { + return _forNpc; + } + + public boolean isAppearanceable() + { + return _isAppearanceable; + } + + /** + * @return {@code true} if the item is blessed, {@code false} otherwise. + */ + public boolean isBlessed() + { + return _isBlessed; + } + + public int getArtifactSlot() + { + return _artifactSlot; + } + + /** + * Returns the name of the item followed by the item ID. + * @return the name and the ID of the item + */ + @Override + public String toString() + { + return _name + "(" + _itemId + ")"; + } + + /** + * Verifies if the item has effects immediately.
+ * Used for herbs mostly. + * @return {@code true} if the item applies effects immediately, {@code false} otherwise + */ + public boolean hasExImmediateEffect() + { + return _exImmediateEffect; + } + + /** + * Verifies if the item has effects immediately. + * @return {@code true} if the item applies effects immediately, {@code false} otherwise + */ + public boolean hasImmediateEffect() + { + return _immediateEffect; + } + + /** + * @return the _default_action + */ + public ActionType getDefaultAction() + { + return _defaultAction; + } + + public int useSkillDisTime() + { + return _useSkillDisTime; + } + + /** + * Gets the item reuse delay time in seconds. + * @return the reuse delay time + */ + public int getReuseDelay() + { + return _reuseDelay; + } + + /** + * Gets the shared reuse group.
+ * Items with the same reuse group will render reuse delay upon those items when used. + * @return the shared reuse group + */ + public int getSharedReuseGroup() + { + return _sharedReuseGroup; + } + + public CommissionItemType getCommissionItemType() + { + return _commissionItemType; + } + + /** + * Usable in HTML windows. + * @return the icon link in client files + */ + public String getIcon() + { + return _icon; + } + + public int getDefaultEnchantLevel() + { + return _defaultEnchantLevel; + } + + public boolean isPetItem() + { + return getItemType() == EtcItemType.PET_COLLAR; + } + + /** + * @param extractableProduct + */ + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + } + + public double getStats(Stat stat, double defaultValue) + { + if (_funcTemplates != null) + { + final FuncTemplate template = _funcTemplates.get(stat); + if ((template != null) && ((template.getFunctionClass() == FuncAdd.class) || (template.getFunctionClass() == FuncSet.class))) + { + return template.getValue(); + } + } + return defaultValue; + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java new file mode 100644 index 0000000000..b289fa70ae --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -0,0 +1,300 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.Collection; +import java.util.Objects; + +import org.l2jmobius.gameserver.enums.AttributeType; +import org.l2jmobius.gameserver.model.VariationInstance; +import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * This class contains Item
+ * Use to sort Item of : + *
    + *
  • Armor
    • + *
  • EtcItem
    • + *
  • Weapon
    • + *
+ * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ + */ +public class WarehouseItem +{ + private final ItemTemplate _item; + private final int _object; + private final long _count; + private final int _owner; + private final int _locationSlot; + private final int _enchant; + private final CrystalType _grade; + private final VariationInstance _augmentation; + private final int _customType1; + private final int _customType2; + private final int _mana; + + private byte _elemAtkType = -2; + private int _elemAtkPower = 0; + + private final int[] _elemDefAttr = + { + 0, + 0, + 0, + 0, + 0, + 0 + }; + + private final int[] _enchantOptions; + private final Collection _soulCrystalOptions; + private final Collection _soulCrystalSpecialOptions; + + private final int _time; + + public WarehouseItem(Item item) + { + Objects.requireNonNull(item); + _item = item.getItem(); + _object = item.getObjectId(); + _count = item.getCount(); + _owner = item.getOwnerId(); + _locationSlot = item.getLocationSlot(); + _enchant = item.getEnchantLevel(); + _customType1 = item.getCustomType1(); + _customType2 = item.getCustomType2(); + _grade = item.getItem().getCrystalType(); + _augmentation = item.getAugmentation(); + _mana = item.getMana(); + _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; + _elemAtkType = item.getAttackAttributeType().getClientId(); + _elemAtkPower = item.getAttackAttributePower(); + for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) + { + _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); + } + _enchantOptions = item.getEnchantOptions(); + _soulCrystalOptions = item.getSpecialAbilities(); + _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); + } + + /** + * @return the item. + */ + public ItemTemplate getItem() + { + return _item; + } + + /** + * @return the unique objectId. + */ + public int getObjectId() + { + return _object; + } + + /** + * @return the owner. + */ + public int getOwnerId() + { + return _owner; + } + + /** + * @return the location slot. + */ + public int getLocationSlot() + { + return _locationSlot; + } + + /** + * @return the count. + */ + public long getCount() + { + return _count; + } + + /** + * @return the first type. + */ + public int getType1() + { + return _item.getType1(); + } + + /** + * @return the second type. + */ + public int getType2() + { + return _item.getType2(); + } + + /** + * @return the second type. + */ + public ItemType getItemType() + { + return _item.getItemType(); + } + + /** + * @return the ItemId. + */ + public int getItemId() + { + return _item.getId(); + } + + /** + * @return the part of body used with this item. + */ + public long getBodyPart() + { + return _item.getBodyPart(); + } + + /** + * @return the enchant level. + */ + public int getEnchantLevel() + { + return _enchant; + } + + /** + * @return the item grade + */ + public CrystalType getItemGrade() + { + return _grade; + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + public boolean isWeapon() + { + return (_item instanceof Weapon); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise. + */ + public boolean isArmor() + { + return (_item instanceof Armor); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + public boolean isEtcItem() + { + return (_item instanceof EtcItem); + } + + /** + * @return the name of the item + */ + public String getItemName() + { + return _item.getName(); + } + + /** + * @return the augmentation If. + */ + public VariationInstance getAugmentation() + { + return _augmentation; + } + + /** + * @return the name of the item + */ + public String getName() + { + return _item.getName(); + } + + public int getCustomType1() + { + return _customType1; + } + + public int getCustomType2() + { + return _customType2; + } + + public int getMana() + { + return _mana; + } + + public byte getAttackElementType() + { + return _elemAtkType; + } + + public int getAttackElementPower() + { + return _elemAtkPower; + } + + public int getElementDefAttr(byte i) + { + return _elemDefAttr[i]; + } + + public int[] getEnchantOptions() + { + return _enchantOptions; + } + + public Collection getSoulCrystalOptions() + { + return _soulCrystalOptions; + } + + public Collection getSoulCrystalSpecialOptions() + { + return _soulCrystalSpecialOptions; + } + + public int getTime() + { + return _time; + } + + /** + * @return the name of the item + */ + @Override + public String toString() + { + return _item.toString(); + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/Weapon.java similarity index 94% rename from L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/Weapon.java rename to L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/Weapon.java index 832169f5f1..4599d5047f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java new file mode 100644 index 0000000000..610e720125 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -0,0 +1,558 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.network.SystemMessageId; + +/** + * @author UnAfraid + */ +public class AppearanceStone +{ + private final int _id; + private final int _cost; + private final int _visualId; + private final long _lifeTime; + private final AppearanceType _type; + private final WeaponType _weaponType; + private final ArmorType _armorType; + private final AppearanceHandType _handType; + private final AppearanceMagicType _magicType; + private List _crystalTypes; + private List _targetTypes; + private List _bodyParts; + private List _races; + private List _racesNot; + private List _allVisualIds; + + public AppearanceStone(StatSet set) + { + _id = set.getInt("id"); + _visualId = set.getInt("visualId", 0); + _cost = set.getInt("cost", 0); + _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); + _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); + _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); + _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); + _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); + _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); + + final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); + if (targetType != AppearanceTargetType.NONE) + { + addTargetType(targetType); + } + + // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. + final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); + + // If no crystal type is defined, we must add all defaults. + if (crystalType == null) + { + switch (targetType) + { + case ACCESSORY: + case ALL: + { + addCrystalType(CrystalType.NONE); + // fallthrough + } + case WEAPON: + case ARMOR: + { + for (CrystalType cryType : CrystalType.values()) + { + if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) + { + addCrystalType(cryType); + } + } + } + } + } + else + { + addCrystalType(crystalType); + } + + final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); + if (bodyPart != ItemTemplate.SLOT_NONE) + { + addBodyPart(bodyPart); + } + + final Race race = set.getEnum("race", Race.class, Race.NONE); + if (race != Race.NONE) + { + addRace(race); + } + + final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); + if (raceNot != Race.NONE) + { + addRaceNot(raceNot); + } + } + + public int getId() + { + return _id; + } + + public int getVisualId() + { + return _visualId; + } + + public int getCost() + { + return _cost; + } + + public long getLifeTime() + { + return _lifeTime; + } + + public AppearanceType getType() + { + return _type; + } + + public WeaponType getWeaponType() + { + return _weaponType; + } + + public ArmorType getArmorType() + { + return _armorType; + } + + public AppearanceHandType getHandType() + { + return _handType; + } + + public AppearanceMagicType getMagicType() + { + return _magicType; + } + + public void addCrystalType(CrystalType type) + { + if (_crystalTypes == null) + { + _crystalTypes = new ArrayList<>(); + } + _crystalTypes.add(type); + } + + public List getCrystalTypes() + { + return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); + } + + public void addTargetType(AppearanceTargetType type) + { + if (_targetTypes == null) + { + _targetTypes = new ArrayList<>(); + } + _targetTypes.add(type); + } + + public List getTargetTypes() + { + return _targetTypes != null ? _targetTypes : Collections.emptyList(); + } + + public void addBodyPart(long part) + { + if (_bodyParts == null) + { + _bodyParts = new ArrayList<>(); + } + _bodyParts.add(part); + } + + public void addVisualId(AppearanceHolder appearanceHolder) + { + if (_allVisualIds == null) + { + _allVisualIds = new ArrayList<>(); + } + _allVisualIds.add(appearanceHolder); + } + + public List getVisualIds() + { + return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); + } + + public List getBodyParts() + { + return _bodyParts != null ? _bodyParts : Collections.emptyList(); + } + + public void addRace(Race race) + { + if (_races == null) + { + _races = new ArrayList<>(); + } + _races.add(race); + } + + public List getRaces() + { + return _races != null ? _races : Collections.emptyList(); + } + + public void addRaceNot(Race race) + { + if (_racesNot == null) + { + _racesNot = new ArrayList<>(); + } + _racesNot.add(race); + } + + public List getRacesNot() + { + return _racesNot != null ? _racesNot : Collections.emptyList(); + } + + /** + * @param player the actor requesting to use this appearance. + * @param targetItem the item to be modified with this appearance. + * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. + */ + public boolean checkConditions(Player player, Item targetItem) + { + if (targetItem == null) + { + return false; + } + + if (getTargetTypes().isEmpty()) + { + return false; + } + + if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); + return false; + } + + switch (_type) + { + case RESTORE: + { + if (targetItem.getVisualId() == 0) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); + return false; + } + + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + default: + { + // Seems like in retail item with already changed appearance, can be changed again without being restored. + + final AppearanceTargetType targetType = getTargetTypes().get(0); + switch (targetType) + { + case NONE: + { + return false; + } + case WEAPON: + { + if (!targetItem.isWeapon()) + { + player.sendPacket(SystemMessageId.WEAPONS_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ARMOR: + { + if (!targetItem.isArmor()) + { + player.sendPacket(SystemMessageId.ARMOR_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ACCESSORY: + { + if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + { + player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); + return false; + } + break; + } + case ALL: + { + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (findVisualChange(targetItem) == null) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + return true; + } + } + break; + } + } + + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (_weaponType != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) + { + if (_weaponType != WeaponType.CROSSBOW) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + } + + switch (_handType) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + } + + switch (_magicType) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + if (_armorType != ArmorType.NONE) + { + switch (_armorType) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + return true; + } + + public AppearanceHolder findVisualChange(Item targetItem) + { + for (AppearanceHolder holder : _allVisualIds) + { + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + { + continue; + } + + if (holder.getWeaponType() != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) + { + if (holder.getWeaponType() != WeaponType.CROSSBOW) + { + continue; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + continue; + } + } + + switch (holder.getHandType()) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + continue; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + continue; + } + break; + } + } + + switch (holder.getMagicType()) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + continue; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + continue; + } + } + } + } + + if (holder.getArmorType() != ArmorType.NONE) + { + switch (holder.getArmorType()) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + continue; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + continue; + } + } + } + } + return holder; + } + return null; + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java similarity index 93% rename from L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java rename to L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java index 6c2b4c08a5..53b89b29bf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; import java.util.EnumMap; import java.util.Map; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java new file mode 100644 index 0000000000..76176d2ab3 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -0,0 +1,212 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.logging.Logger; + +import org.l2jmobius.commons.util.CommonUtil; +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public abstract class AbstractEnchantItem +{ + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); + + private static final ItemType[] ENCHANT_TYPES = new ItemType[] + { + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + EtcItemType.BLESS_ENCHT_AM, + EtcItemType.BLESS_ENCHT_AM_DOWN, + EtcItemType.BLESS_ENCHT_WP, + EtcItemType.ENCHT_AM, + EtcItemType.ENCHT_WP, + EtcItemType.ENCHT_WP_DOWN, + EtcItemType.ENCHT_AM_DOWN, + EtcItemType.GIANT_ENCHT_AM, + EtcItemType.GIANT_ENCHT_WP, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + }; + + private final int _id; + private final CrystalType _grade; + private final int _minEnchantLevel; + private final int _maxEnchantLevel; + private final int _safeEnchantLevel; + private final int _randomEnchantMin; + private final int _randomEnchantMax; + private final double _bonusRate; + + public AbstractEnchantItem(StatSet set) + { + _id = set.getInt("id"); + if (getItem() == null) + { + throw new NullPointerException(); + } + else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) + { + throw new IllegalAccessError(); + } + _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); + _minEnchantLevel = set.getInt("minEnchant", 0); + _maxEnchantLevel = set.getInt("maxEnchant", 127); + _safeEnchantLevel = set.getInt("safeEnchant", 0); + _randomEnchantMin = set.getInt("randomEnchantMin", 1); + _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); + _bonusRate = set.getDouble("bonusRate", 0); + } + + /** + * @return id of current item + */ + public int getId() + { + return _id; + } + + /** + * @return bonus chance that would be added + */ + public double getBonusRate() + { + return _bonusRate; + } + + /** + * @return {@link ItemTemplate} current item/scroll + */ + public ItemTemplate getItem() + { + return ItemTable.getInstance().getTemplate(_id); + } + + /** + * @return grade of the item/scroll. + */ + public CrystalType getGrade() + { + return _grade; + } + + /** + * @return {@code true} if scroll is for weapon, {@code false} for armor + */ + public abstract boolean isWeapon(); + + /** + * @return the minimum enchant level that this scroll/item can be used with + */ + public int getMinEnchantLevel() + { + return _minEnchantLevel; + } + + /** + * @return the maximum enchant level that this scroll/item can be used with + */ + public int getMaxEnchantLevel() + { + return _maxEnchantLevel; + } + + /** + * @return the safe enchant level of this scroll/item + */ + public int getSafeEnchant() + { + return _safeEnchantLevel; + } + + /** + * @return the minimum random enchant level of this scroll/item + */ + public int getRandomEnchantMin() + { + return _randomEnchantMin; + } + + /** + * @return the maximum random enchant level of this scroll/item + */ + public int getRandomEnchantMax() + { + return _randomEnchantMax; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem + * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise + */ + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if (itemToEnchant == null) + { + return false; + } + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + { + return false; + } + else if (!isValidItemType(itemToEnchant.getItem().getType2())) + { + return false; + } + else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) + { + return false; + } + else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + { + return false; + } + return true; + } + + /** + * @param type2 + * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise + */ + private boolean isValidItemType(int type2) + { + if (type2 == ItemTemplate.TYPE2_WEAPON) + { + return isWeapon(); + } + else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) + { + return !isWeapon(); + } + return false; + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..1099b77054 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private long _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(long slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java new file mode 100644 index 0000000000..ea29d773db --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -0,0 +1,225 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.HashSet; +import java.util.Set; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.data.xml.EnchantItemData; +import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author UnAfraid + */ +public class EnchantScroll extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isBlessedDown; + private final boolean _isSafe; + private final boolean _isGiant; + private final int _scrollGroupId; + private Set _items; + + public EnchantScroll(StatSet set) + { + super(set); + _scrollGroupId = set.getInt("scrollGroupId", 0); + + final ItemType type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN); + _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + /** + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will reset to 0), {@code false} otherwise + */ + public boolean isBlessed() + { + return _isBlessed; + } + + /** + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise + */ + public boolean isBlessedDown() + { + return _isBlessedDown; + } + + /** + * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise + */ + public boolean isSafe() + { + return _isSafe; + } + + public boolean isGiant() + { + return _isGiant; + } + + /** + * @return id of scroll group that should be used + */ + public int getScrollGroupId() + { + return _scrollGroupId; + } + + /** + * Enforces current scroll to use only those items as possible items to enchant + * @param itemId + */ + public void addItem(int itemId) + { + if (_items == null) + { + _items = new HashSet<>(); + } + _items.add(itemId); + } + + public Set getItems() + { + return _items; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem the support item used when enchanting (can be null) + * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise + */ + @Override + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if ((_items != null) && !_items.contains(itemToEnchant.getId())) + { + return false; + } + else if ((supportItem != null)) + { + if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed())) + { + return false; + } + else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant())) + { + return false; + } + else if (!supportItem.isValid(itemToEnchant, supportItem)) + { + return false; + } + else if (supportItem.isWeapon() != isWeapon()) + { + return false; + } + } + if (_items == null) + { + for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls()) + { + if (scroll.getId() == getId()) + { + continue; + } + final Set scrollItems = scroll.getItems(); + if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId())) + { + return false; + } + } + } + return super.isValid(itemToEnchant, supportItem); + } + + /** + * @param player + * @param enchantItem + * @return the chance of current scroll's group. + */ + public double getChance(Player player, Item enchantItem) + { + if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) + { + LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); + return -1; + } + + final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); + if (group == null) + { + LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); + return -1; + } + + if ((getSafeEnchant() > 0) && (enchantItem.getEnchantLevel() < getSafeEnchant())) + { + return 100; + } + + return group.getChance(enchantItem.getEnchantLevel()); + } + + /** + * @param player + * @param enchantItem + * @param supportItem + * @return the total chance for success rate of this scroll + */ + public EnchantResultType calculateSuccess(Player player, Item enchantItem, EnchantSupportItem supportItem) + { + if (!isValid(enchantItem, supportItem)) + { + return EnchantResultType.ERROR; + } + + final double chance = getChance(player, enchantItem); + if (chance == -1) + { + return EnchantResultType.ERROR; + } + + final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; + final double bonusRate = getBonusRate(); + final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; + final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100); + final double random = 100 * Rnd.nextDouble(); + final boolean success = (random < finalChance) || player.tryLuck(); + return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE; + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java new file mode 100644 index 0000000000..308f08c38b --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -0,0 +1,64 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public class EnchantSupportItem extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isDown; + private final boolean _isGiant; + private final ItemType type; + + public EnchantSupportItem(StatSet set) + { + super(set); + type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.ENCHT_WP_DOWN) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isDown = (type == EtcItemType.ENCHT_AM_DOWN) || (type == EtcItemType.ENCHT_WP_DOWN); + _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + public boolean isBlessed() + { + return _isBlessed; + } + + public boolean isDown() + { + return _isDown; + } + + public boolean isGiant() + { + return _isGiant; + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java index e0c5dc5b59..bd90178552 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -75,15 +75,15 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java new file mode 100644 index 0000000000..d325c3ffa9 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -0,0 +1,115 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Crystal Type enumerated. + * @author Adry_85 + */ +public enum CrystalType +{ + NONE(0, 0, 0, 0), + D(1, 1458, 11, 90), + C(2, 1459, 6, 45), + B(3, 1460, 11, 67), + A(4, 1461, 20, 145), + S(5, 1462, 25, 250), + S80(6, 1462, 25, 250), + S84(7, 1462, 25, 250), + R(8, 17371, 30, 500), + R95(9, 17371, 30, 500), + R99(10, 17371, 30, 500), + R110(11, 17371, 30, 500), + EVENT(12, 0, 0, 0); + + private final int _level; + private final int _crystalId; + private final int _crystalEnchantBonusArmor; + private final int _crystalEnchantBonusWeapon; + + CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) + { + _level = level; + _crystalId = crystalId; + _crystalEnchantBonusArmor = crystalEnchantBonusArmor; + _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; + } + + /** + * Gets the crystal type ID. + * @return the crystal type ID + */ + public int getLevel() + { + return _level; + } + + /** + * Gets the item ID of the crystal. + * @return the item ID of the crystal + */ + public int getCrystalId() + { + return _crystalId; + } + + public int getCrystalEnchantBonusArmor() + { + return _crystalEnchantBonusArmor; + } + + public int getCrystalEnchantBonusWeapon() + { + return _crystalEnchantBonusWeapon; + } + + public boolean isGreater(CrystalType crystalType) + { + return getLevel() > crystalType.getLevel(); + } + + public boolean isLesser(CrystalType crystalType) + { + return getLevel() < crystalType.getLevel(); + } + + public CrystalType plusLevel(int levelValue) + { + final int level = levelValue + _level; + if (level >= CrystalType.R110.getLevel()) + { + return CrystalType.R110; + } + if (level <= CrystalType.NONE.getLevel()) + { + return CrystalType.NONE; + } + return getByLevel(level); + } + + public static CrystalType getByLevel(int level) + { + for (CrystalType crystalType : values()) + { + if (crystalType.getLevel() == level) + { + return crystalType; + } + } + return null; + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java new file mode 100644 index 0000000000..c9c153923e --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -0,0 +1,106 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * EtcItem Type enumerated. + */ +public enum EtcItemType implements ItemType +{ + NONE, + SCROLL, + ARROW, + POTION, + SPELLBOOK, + RECIPE, + MATERIAL, + PET_COLLAR, + CASTLE_GUARD, + DYE, + SEED, + SEED2, + HARVEST, + LOTTO, + RACE_TICKET, + TICKET_OF_LORD, + LURE, + CROP, + MATURECROP, + ENCHT_WP, + ENCHT_AM, + ENCHT_AM_DOWN, + ENCHT_WP_DOWN, + GIANT_ENCHT_WP, + GIANT_ENCHT_AM, + BLESS_ENCHT_WP, + BLESS_ENCHT_AM, + BLESS_ENCHT_AM_DOWN, + COUPON, + ELIXIR, + ENCHT_ATTR, + ENCHT_ATTR_CURSED, + BOLT, + ENCHT_ATTR_INC_PROP_ENCHT_WP, + ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_RUNE, + ENCHT_ATTRT_RUNE_SELECT, + TELEPORTBOOKMARK, + CHANGE_ATTR, + SOULSHOT, + SHAPE_SHIFTING_WP, + BLESS_SHAPE_SHIFTING_WP, + SHAPE_SHIFTING_WP_FIXED, + SHAPE_SHIFTING_AM, + BLESS_SHAPE_SHIFTING_AM, + SHAPE_SHIFTING_AM_FIXED, + SHAPE_SHIFTING_HAIRACC, + BLESS_SHAPE_SHIFTING_HAIRACC, + SHAPE_SHIFTING_HAIRACC_FIXED, + RESTORE_SHAPE_SHIFTING_WP, + RESTORE_SHAPE_SHIFTING_AM, + RESTORE_SHAPE_SHIFTING_HAIRACC, + RESTORE_SHAPE_SHIFTING_ALLITEM, + BLESS_INC_PROP_ENCHT_WP, + BLESS_INC_PROP_ENCHT_AM, + CARD_EVENT, + SHAPE_SHIFTING_ALLITEM_FIXED, + MULTI_ENCHT_WP, + MULTI_ENCHT_AM, + MULTI_INC_PROB_ENCHT_WP, + MULTI_INC_PROB_ENCHT_AM, + SOUL_CRYSTAL, + ENSOUL_STONE; + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return 0; + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 8323d4bdc7..06760564d7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 6653418e1e..b7ed29cd1c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -54,13 +54,13 @@ import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 9f50c399b6..aec33c3013 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,10 +40,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/Henna.java deleted file mode 100644 index 426a12682a..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/Henna.java +++ /dev/null @@ -1,183 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; - -import org.l2jmobius.gameserver.enums.ClassId; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; - -/** - * Class for the Henna object. - * @author Zoey76 - */ -public class Henna -{ - private final int _dyeId; - private final int _dyeItemId; - private final boolean _isPremium; - private final Map _baseStats = new EnumMap<>(BaseStat.class); - private final int _wearFee; - private final int _wearCount; - private final int _cancelFee; - private final int _cancelCount; - private final int _duration; - private final List _skills; - private final List _wearClass; - - public Henna(StatSet set) - { - _dyeId = set.getInt("dyeId"); - _dyeItemId = set.getInt("dyeItemId"); - _isPremium = set.getBoolean("isPremium", false); - _baseStats.put(BaseStat.STR, set.getInt("str", 0)); - _baseStats.put(BaseStat.CON, set.getInt("con", 0)); - _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); - _baseStats.put(BaseStat.INT, set.getInt("int", 0)); - _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); - _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _baseStats.put(BaseStat.LUC, set.getInt("luc", 0)); - _baseStats.put(BaseStat.CHA, set.getInt("cha", 0)); - _wearFee = set.getInt("wear_fee"); - _wearCount = set.getInt("wear_count"); - _cancelFee = set.getInt("cancel_fee"); - _cancelCount = set.getInt("cancel_count"); - _duration = set.getInt("duration", -1); - _skills = new ArrayList<>(); - _wearClass = new ArrayList<>(); - } - - /** - * @return the dye Id. - */ - public int getDyeId() - { - return _dyeId; - } - - /** - * @return the item Id, required for this dye. - */ - public int getDyeItemId() - { - return _dyeItemId; - } - - /** - * @return true if this dye is premium. - */ - public boolean isPremium() - { - return _isPremium; - } - - public int getBaseStats(BaseStat stat) - { - return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); - } - - public Map getBaseStats() - { - return _baseStats; - } - - /** - * @return the wear fee, cost for adding this dye to the player. - */ - public int getWearFee() - { - return _wearFee; - } - - /** - * @return the wear count, the required count to add this dye to the player. - */ - public int getWearCount() - { - return _wearCount; - } - - /** - * @return the cancel fee, cost for removing this dye from the player. - */ - public int getCancelFee() - { - return _cancelFee; - } - - /** - * @return the cancel count, the retrieved amount of dye items after removing the dye. - */ - public int getCancelCount() - { - return _cancelCount; - } - - /** - * @return the duration of this dye. - */ - public int getDuration() - { - return _duration; - } - - /** - * @param skillList the list of skills related to this dye. - */ - public void setSkills(List skillList) - { - _skills.addAll(skillList); - } - - /** - * @return the skills related to this dye. - */ - public List getSkills() - { - return _skills; - } - - /** - * @return the list with the allowed classes to wear this dye. - */ - public List getAllowedWearClass() - { - return _wearClass; - } - - /** - * @param classId the class trying to wear this dye. - * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. - */ - public boolean isAllowedClass(ClassId classId) - { - return _wearClass.contains(classId); - } - - /** - * @param wearClassIds the list of classes that can wear this dye. - */ - public void setWearClassIds(List wearClassIds) - { - _wearClass.addAll(wearClassIds); - } -} \ No newline at end of file diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java deleted file mode 100644 index d58318fe05..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ /dev/null @@ -1,1081 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.EnumMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; -import java.util.function.Predicate; -import java.util.logging.Logger; - -import org.l2jmobius.Config; -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.enums.ItemGrade; -import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.PlayerCondOverride; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.commission.CommissionItemType; -import org.l2jmobius.gameserver.model.conditions.Condition; -import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; -import org.l2jmobius.gameserver.model.stats.Stat; -import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; -import org.l2jmobius.gameserver.model.stats.functions.FuncSet; -import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; - -/** - * This class contains all informations concerning the item (weapon, armor, etc).
- * Mother class of : - *
    - *
  • Armor
    • - *
  • EtcItem
    • - *
  • Weapon
    • - *
- */ -public abstract class ItemTemplate extends ListenersContainer implements IIdentifiable -{ - protected static final Logger LOGGER = Logger.getLogger(ItemTemplate.class.getName()); - - public static final int TYPE1_WEAPON_RING_EARRING_NECKLACE = 0; - public static final int TYPE1_SHIELD_ARMOR = 1; - public static final int TYPE1_ITEM_QUESTITEM_ADENA = 4; - - public static final int TYPE2_WEAPON = 0; - public static final int TYPE2_SHIELD_ARMOR = 1; - public static final int TYPE2_ACCESSORY = 2; - public static final int TYPE2_QUEST = 3; - public static final int TYPE2_MONEY = 4; - public static final int TYPE2_OTHER = 5; - - public static final int SLOT_NONE = 0x0000; - public static final int SLOT_UNDERWEAR = 0x0001; - public static final int SLOT_R_EAR = 0x0002; - public static final int SLOT_L_EAR = 0x0004; - public static final int SLOT_LR_EAR = 0x00006; - public static final int SLOT_NECK = 0x0008; - public static final int SLOT_R_FINGER = 0x0010; - public static final int SLOT_L_FINGER = 0x0020; - public static final int SLOT_LR_FINGER = 0x0030; - public static final int SLOT_HEAD = 0x0040; - public static final int SLOT_R_HAND = 0x0080; - public static final int SLOT_L_HAND = 0x0100; - public static final int SLOT_GLOVES = 0x0200; - public static final int SLOT_CHEST = 0x0400; - public static final int SLOT_LEGS = 0x0800; - public static final int SLOT_FEET = 0x1000; - public static final int SLOT_BACK = 0x2000; - public static final int SLOT_LR_HAND = 0x4000; - public static final int SLOT_FULL_ARMOR = 0x8000; - public static final int SLOT_HAIR = 0x010000; - public static final int SLOT_ALLDRESS = 0x020000; - public static final int SLOT_HAIR2 = 0x040000; - public static final int SLOT_HAIRALL = 0x080000; - public static final int SLOT_R_BRACELET = 0x100000; - public static final int SLOT_L_BRACELET = 0x200000; - public static final int SLOT_DECO = 0x400000; - public static final int SLOT_BELT = 0x10000000; - public static final int SLOT_BROOCH = 0x20000000; - public static final int SLOT_BROOCH_JEWEL = 0x40000000; - public static final long SLOT_AGATHION = 0x3000000000L; - public static final long SLOT_ARTIFACT_BOOK = 0x20000000000L; - public static final long SLOT_ARTIFACT = 0x40000000000L; - - public static final int SLOT_WOLF = -100; - public static final int SLOT_HATCHLING = -101; - public static final int SLOT_STRIDER = -102; - public static final int SLOT_BABYPET = -103; - public static final int SLOT_GREATWOLF = -104; - - public static final int SLOT_MULTI_ALLWEAPON = SLOT_LR_HAND | SLOT_R_HAND; - - private int _itemId; - private int _displayId; - private String _name; - private String _additionalName; - private String _icon; - private int _weight; - private boolean _stackable; - private MaterialType _materialType; - private CrystalType _crystalType; - private int _equipReuseDelay; - private int _duration; - private long _time; - private int _autoDestroyTime; - private long _bodyPart; - private long _referencePrice; - private int _crystalCount; - private boolean _sellable; - private boolean _dropable; - private boolean _destroyable; - private boolean _tradeable; - private boolean _depositable; - private boolean _enchantable; - private int _enchantLimit; - private boolean _elementable; - private boolean _questItem; - private boolean _freightable; - private boolean _allowSelfResurrection; - private boolean _isOlyRestricted; - private boolean _isEventRestricted; - private boolean _forNpc; - private boolean _common; - private boolean _heroItem; - private boolean _pvpItem; - private boolean _immediateEffect; - private boolean _exImmediateEffect; - private int _defaultEnchantLevel; - private ActionType _defaultAction; - - protected int _type1; // needed for item list (inventory) - protected int _type2; // different lists for armor, weapon, etc - private Map _elementals = null; - protected Map _funcTemplates; - protected List _preConditions; - private List _skills; - - private int _useSkillDisTime; - private int _reuseDelay; - private int _sharedReuseGroup; - - private CommissionItemType _commissionItemType; - - private boolean _isAppearanceable; - private boolean _isBlessed; - - private int _artifactSlot; - - /** - * Constructor of the Item that fill class variables. - * @param set : StatSet corresponding to a set of couples (key,value) for description of the item - */ - protected ItemTemplate(StatSet set) - { - set(set); - } - - public void set(StatSet set) - { - _itemId = set.getInt("item_id"); - _displayId = set.getInt("displayId", _itemId); - _name = set.getString("name"); - _additionalName = set.getString("additionalName", null); - _icon = set.getString("icon", null); - _weight = set.getInt("weight", 0); - _materialType = set.getEnum("material", MaterialType.class, MaterialType.STEEL); - _equipReuseDelay = set.getInt("equip_reuse_delay", 0) * 1000; - _duration = set.getInt("duration", -1); - _time = set.getInt("time", -1); - _autoDestroyTime = set.getInt("auto_destroy_time", -1) * 1000; - _bodyPart = ItemTable.SLOTS.get(set.getString("bodypart", "none")); - _referencePrice = set.getLong("price", 0); - _crystalType = set.getEnum("crystal_type", CrystalType.class, CrystalType.NONE); - _crystalCount = set.getInt("crystal_count", 0); - _stackable = set.getBoolean("is_stackable", false); - _sellable = set.getBoolean("is_sellable", true); - _dropable = set.getBoolean("is_dropable", true); - _destroyable = set.getBoolean("is_destroyable", true); - _tradeable = set.getBoolean("is_tradable", true); - _questItem = set.getBoolean("is_questitem", false); - if (Config.CUSTOM_DEPOSITABLE_ENABLED) - { - _depositable = !_questItem || Config.CUSTOM_DEPOSITABLE_QUEST_ITEMS; - } - else - { - _depositable = set.getBoolean("is_depositable", true); - } - - _elementable = set.getBoolean("element_enabled", false); - _enchantable = set.getBoolean("enchant_enabled", false); - _enchantLimit = set.getInt("enchant_limit", 0); - _freightable = set.getBoolean("is_freightable", false); - _allowSelfResurrection = set.getBoolean("allow_self_resurrection", false); - _isOlyRestricted = set.getBoolean("is_oly_restricted", false); - _isEventRestricted = set.getBoolean("is_event_restricted", false); - _forNpc = set.getBoolean("for_npc", false); - _isAppearanceable = set.getBoolean("isAppearanceable", false); - _isBlessed = set.getBoolean("blessed", false); - _artifactSlot = set.getInt("artifactSlot", 0); - _immediateEffect = set.getBoolean("immediate_effect", false); - _exImmediateEffect = set.getBoolean("ex_immediate_effect", false); - _defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE); - _useSkillDisTime = set.getInt("useSkillDisTime", 0); - _defaultEnchantLevel = set.getInt("enchanted", 0); - _reuseDelay = set.getInt("reuse_delay", 0); - _sharedReuseGroup = set.getInt("shared_reuse_group", 0); - _commissionItemType = set.getEnum("commissionItemType", CommissionItemType.class, CommissionItemType.OTHER_ITEM); - _common = ((_itemId >= 11605) && (_itemId <= 12361)); - _heroItem = ((_itemId >= 6611) && (_itemId <= 6621)) || ((_itemId >= 9388) && (_itemId <= 9390)) || (_itemId == 6842); - _pvpItem = ((_itemId >= 10667) && (_itemId <= 10835)) || ((_itemId >= 12852) && (_itemId <= 12977)) || ((_itemId >= 14363) && (_itemId <= 14525)) || (_itemId == 14528) || (_itemId == 14529) || (_itemId == 14558) || ((_itemId >= 15913) && (_itemId <= 16024)) || ((_itemId >= 16134) && (_itemId <= 16147)) || (_itemId == 16149) || (_itemId == 16151) || (_itemId == 16153) || (_itemId == 16155) || (_itemId == 16157) || (_itemId == 16159) || ((_itemId >= 16168) && (_itemId <= 16176)) || ((_itemId >= 16179) && (_itemId <= 16220)) || ((_itemId >= 21932) && (_itemId <= 21934)) || (_itemId == 21938) || ((_itemId >= 21952) && (_itemId <= 21954)) || (_itemId == 21958) || ((_itemId >= 21970) && (_itemId <= 21972)); - } - - /** - * Returns the itemType. - * @return Enum - */ - public abstract ItemType getItemType(); - - /** - * Verifies if the item is an etc item. - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - public boolean isEtcItem() - { - return false; - } - - /** - * Verifies if the item is an armor. - * @return {@code true} if the item is an armor, {@code false} otherwise. - */ - public boolean isArmor() - { - return false; - } - - /** - * Verifies if the item is a weapon. - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - public boolean isWeapon() - { - return false; - } - - /** - * Verifies if the item is a magic weapon. - * @return {@code true} if the weapon is magic, {@code false} otherwise. - */ - public boolean isMagicWeapon() - { - return false; - } - - /** - * @return the _equipReuseDelay - */ - public int getEquipReuseDelay() - { - return _equipReuseDelay; - } - - /** - * Returns the duration of the item - * @return int - */ - public int getDuration() - { - return _duration; - } - - /** - * Returns the time of the item - * @return long - */ - public long getTime() - { - return _time; - } - - /** - * @return the auto destroy time of the item in seconds: 0 or less - default - */ - public int getAutoDestroyTime() - { - return _autoDestroyTime; - } - - /** - * Returns the ID of the item - * @return int - */ - @Override - public int getId() - { - return _itemId; - } - - /** - * Returns the ID of the item - * @return int - */ - public int getDisplayId() - { - return _displayId; - } - - public abstract int getItemMask(); - - /** - * Return the type of material of the item - * @return MaterialType - */ - public MaterialType getMaterialType() - { - return _materialType; - } - - /** - * Returns the type 2 of the item - * @return int - */ - public int getType2() - { - return _type2; - } - - /** - * Returns the weight of the item - * @return int - */ - public int getWeight() - { - return _weight; - } - - /** - * Returns if the item is crystallizable - * @return boolean - */ - public boolean isCrystallizable() - { - return (_crystalType != CrystalType.NONE) && (_crystalCount > 0); - } - - /** - * @return return General item grade (No S80, S84, R95, R99) - */ - public ItemGrade getItemGrade() - { - return ItemGrade.valueOf(_crystalType); - } - - /** - * Return the type of crystal if item is crystallizable - * @return CrystalType - */ - public CrystalType getCrystalType() - { - return _crystalType; - } - - /** - * Return the ID of crystal if item is crystallizable - * @return int - */ - public int getCrystalItemId() - { - return _crystalType.getCrystalId(); - } - - /** - * For grades S80 and S84 return S, R95, and R99 return R - * @return the grade of the item. - */ - public CrystalType getCrystalTypePlus() - { - switch (_crystalType) - { - case S80: - case S84: - { - return CrystalType.S; - } - case R95: - case R99: - case R110: - { - return CrystalType.R; - } - default: - { - return _crystalType; - } - } - } - - /** - * @return the quantity of crystals for crystallization. - */ - public int getCrystalCount() - { - return _crystalCount; - } - - /** - * @param enchantLevel - * @return the quantity of crystals for crystallization on specific enchant level - */ - public int getCrystalCount(int enchantLevel) - { - if (enchantLevel > 3) - { - switch (_type2) - { - case TYPE2_SHIELD_ARMOR: - case TYPE2_ACCESSORY: - { - return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6)); - } - case TYPE2_WEAPON: - { - return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3)); - } - default: - { - return _crystalCount; - } - } - } - else if (enchantLevel > 0) - { - switch (_type2) - { - case TYPE2_SHIELD_ARMOR: - case TYPE2_ACCESSORY: - { - return _crystalCount + (_crystalType.getCrystalEnchantBonusArmor() * enchantLevel); - } - case TYPE2_WEAPON: - { - return _crystalCount + (_crystalType.getCrystalEnchantBonusWeapon() * enchantLevel); - } - default: - { - return _crystalCount; - } - } - } - else - { - return _crystalCount; - } - } - - /** - * @return the name of the item. - */ - public String getName() - { - return _name; - } - - /** - * @return the item's additional name. - */ - public String getAdditionalName() - { - return _additionalName; - } - - public Collection getAttributes() - { - return _elementals != null ? _elementals.values() : null; - } - - public AttributeHolder getAttribute(AttributeType type) - { - return _elementals != null ? _elementals.get(type) : null; - } - - /** - * Sets the base elemental of the item. - * @param holder the element to set. - */ - public void setAttributes(AttributeHolder holder) - { - if (_elementals == null) - { - _elementals = new LinkedHashMap<>(3); - _elementals.put(holder.getType(), holder); - } - else - { - final AttributeHolder attribute = getAttribute(holder.getType()); - if (attribute != null) - { - attribute.setValue(holder.getValue()); - } - else - { - _elementals.put(holder.getType(), holder); - } - } - } - - /** - * @return the part of the body used with the item. - */ - public long getBodyPart() - { - return _bodyPart; - } - - /** - * @return the type 1 of the item. - */ - public int getType1() - { - return _type1; - } - - /** - * @return {@code true} if the item is stackable, {@code false} otherwise. - */ - public boolean isStackable() - { - return _stackable; - } - - /** - * @return {@code true} if the item can be equipped, {@code false} otherwise. - */ - public boolean isEquipable() - { - return (_bodyPart != 0) && !(getItemType() instanceof EtcItemType); - } - - /** - * @return the price of reference of the item. - */ - public long getReferencePrice() - { - return _referencePrice; - } - - /** - * @return {@code true} if the item can be sold, {@code false} otherwise. - */ - public boolean isSellable() - { - return _sellable; - } - - /** - * @return {@code true} if the item can be dropped, {@code false} otherwise. - */ - public boolean isDropable() - { - return _dropable; - } - - /** - * @return {@code true} if the item can be destroyed, {@code false} otherwise. - */ - public boolean isDestroyable() - { - return _destroyable; - } - - /** - * @return {@code true} if the item can be traded, {@code false} otherwise. - */ - public boolean isTradeable() - { - return _tradeable; - } - - /** - * @return {@code true} if the item can be put into warehouse, {@code false} otherwise. - */ - public boolean isDepositable() - { - return _depositable; - } - - /** - * This method also check the enchant blacklist. - * @return {@code true} if the item can be enchanted, {@code false} otherwise. - */ - public boolean isEnchantable() - { - return (Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0) && _enchantable; - } - - /** - * Returns the enchantment limit of the item - * @return int - */ - public int getEnchantLimit() - { - return _enchantLimit > 0 ? _enchantLimit : 0; - } - - /** - * @return {@code true} if the item can be elemented, {@code false} otherwise. - */ - public boolean isElementable() - { - return _elementable; - } - - /** - * Returns if item is common - * @return boolean - */ - public boolean isCommon() - { - return _common; - } - - /** - * Returns if item is hero-only - * @return - */ - public boolean isHeroItem() - { - return _heroItem; - } - - /** - * Returns if item is pvp - * @return - */ - public boolean isPvpItem() - { - return _pvpItem; - } - - public boolean isPotion() - { - return getItemType() == EtcItemType.POTION; - } - - public boolean isElixir() - { - return getItemType() == EtcItemType.ELIXIR; - } - - public boolean isScroll() - { - return getItemType() == EtcItemType.SCROLL; - } - - /** - * Add the FuncTemplate f to the list of functions used with the item - * @param template : FuncTemplate to add - */ - public void addFunctionTemplate(FuncTemplate template) - { - switch (template.getStat()) - { - case FIRE_RES: - case FIRE_POWER: - { - setAttributes(new AttributeHolder(AttributeType.FIRE, (int) template.getValue())); - break; - } - case WATER_RES: - case WATER_POWER: - { - setAttributes(new AttributeHolder(AttributeType.WATER, (int) template.getValue())); - break; - } - case WIND_RES: - case WIND_POWER: - { - setAttributes(new AttributeHolder(AttributeType.WIND, (int) template.getValue())); - break; - } - case EARTH_RES: - case EARTH_POWER: - { - setAttributes(new AttributeHolder(AttributeType.EARTH, (int) template.getValue())); - break; - } - case HOLY_RES: - case HOLY_POWER: - { - setAttributes(new AttributeHolder(AttributeType.HOLY, (int) template.getValue())); - break; - } - case DARK_RES: - case DARK_POWER: - { - setAttributes(new AttributeHolder(AttributeType.DARK, (int) template.getValue())); - break; - } - } - - if (_funcTemplates == null) - { - _funcTemplates = new EnumMap<>(Stat.class); - } - if (_funcTemplates.put(template.getStat(), template) != null) - { - LOGGER.warning("Item with id " + _itemId + " has 2 func templates with same stat: " + template.getStat()); - } - } - - public void attachCondition(Condition c) - { - if (_preConditions == null) - { - _preConditions = new ArrayList<>(); - } - _preConditions.add(c); - } - - public List getConditions() - { - return _preConditions; - } - - public boolean hasSkills() - { - return _skills != null; - } - - /** - * Method to retrieve skills linked to this item armor and weapon: passive skills etcitem: skills used on item use <-- ??? - * @return Skills linked to this item as SkillHolder[] - */ - public List getAllSkills() - { - return _skills; - } - - /** - * @param condition - * @return {@code List} of {@link ItemSkillHolder} if item has skills and matches the condition, {@code null} otherwise - */ - public List getSkills(Predicate condition) - { - if (_skills == null) - { - return null; - } - - final List result = new ArrayList<>(); - for (ItemSkillHolder skill : _skills) - { - if (condition.test(skill)) - { - result.add(skill); - } - } - return result; - } - - /** - * @param type - * @return {@code List} of {@link ItemSkillHolder} if item has skills, {@code null} otherwise - */ - public List getSkills(ItemSkillType type) - { - if (_skills == null) - { - return null; - } - - final List result = new ArrayList<>(); - for (ItemSkillHolder skill : _skills) - { - if (skill.getType() == type) - { - result.add(skill); - } - } - return result; - } - - /** - * Executes the action on each item skill with the specified type (If there are skills at all) - * @param type - * @param action - */ - public void forEachSkill(ItemSkillType type, Consumer action) - { - if (_skills != null) - { - for (ItemSkillHolder skill : _skills) - { - if (skill.getType() == type) - { - action.accept(skill); - } - } - } - } - - public void addSkill(ItemSkillHolder holder) - { - // Agathion skills managed by AgathionData. - // if ((getBodyPart() == SLOT_AGATHION) && (holder.getType() != ItemSkillType.ON_EQUIP) && (holder.getType() != ItemSkillType.ON_UNEQUIP)) - // { - // LOGGER.warning("Remove from agathion " + _itemId + " " + holder + "!"); - // return; - // } - - if (_skills == null) - { - _skills = new ArrayList<>(); - } - _skills.add(holder); - } - - public boolean checkCondition(Creature creature, WorldObject object, boolean sendMessage) - { - if (creature.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS) && !Config.GM_ITEM_RESTRICTION) - { - return true; - } - - // Don't allow hero equipment and restricted items during Olympiad - if ((isOlyRestrictedItem() || _heroItem) && (creature.isPlayer() && creature.getActingPlayer().isInOlympiadMode())) - { - if (isEquipable()) - { - creature.sendPacket(SystemMessageId.YOU_CANNOT_EQUIP_THAT_ITEM_IN_A_OLYMPIAD_MATCH); - } - else - { - creature.sendPacket(SystemMessageId.YOU_CANNOT_USE_THAT_ITEM_IN_A_OLYMPIAD_MATCH); - } - return false; - } - - if (_isEventRestricted && (creature.isPlayer() && (creature.getActingPlayer().isOnEvent()))) - { - creature.sendMessage("You cannot use this item in the event."); - return false; - } - - if (!isConditionAttached()) - { - return true; - } - - final Creature target = object.isCreature() ? (Creature) object : null; - for (Condition preCondition : _preConditions) - { - if (preCondition == null) - { - continue; - } - - if (!preCondition.test(creature, target, null, null)) - { - if (creature.isSummon()) - { - creature.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM); - return false; - } - - if (sendMessage) - { - final String msg = preCondition.getMessage(); - final int msgId = preCondition.getMessageId(); - if (msg != null) - { - creature.sendMessage(msg); - } - else if (msgId != 0) - { - final SystemMessage sm = new SystemMessage(msgId); - if (preCondition.isAddName()) - { - sm.addItemName(_itemId); - } - creature.sendPacket(sm); - } - } - return false; - } - } - return true; - } - - public boolean isConditionAttached() - { - return (_preConditions != null) && !_preConditions.isEmpty(); - } - - public boolean isQuestItem() - { - return _questItem; - } - - public boolean isFreightable() - { - return _freightable; - } - - public boolean isAllowSelfResurrection() - { - return _allowSelfResurrection; - } - - public boolean isOlyRestrictedItem() - { - return _isOlyRestricted || Config.LIST_OLY_RESTRICTED_ITEMS.contains(_itemId); - } - - /** - * @return {@code true} if item cannot be used in event games. - */ - public boolean isEventRestrictedItem() - { - return _isEventRestricted; - } - - public boolean isForNpc() - { - return _forNpc; - } - - public boolean isAppearanceable() - { - return _isAppearanceable; - } - - /** - * @return {@code true} if the item is blessed, {@code false} otherwise. - */ - public boolean isBlessed() - { - return _isBlessed; - } - - public int getArtifactSlot() - { - return _artifactSlot; - } - - /** - * Returns the name of the item followed by the item ID. - * @return the name and the ID of the item - */ - @Override - public String toString() - { - return _name + "(" + _itemId + ")"; - } - - /** - * Verifies if the item has effects immediately.
- * Used for herbs mostly. - * @return {@code true} if the item applies effects immediately, {@code false} otherwise - */ - public boolean hasExImmediateEffect() - { - return _exImmediateEffect; - } - - /** - * Verifies if the item has effects immediately. - * @return {@code true} if the item applies effects immediately, {@code false} otherwise - */ - public boolean hasImmediateEffect() - { - return _immediateEffect; - } - - /** - * @return the _default_action - */ - public ActionType getDefaultAction() - { - return _defaultAction; - } - - public int useSkillDisTime() - { - return _useSkillDisTime; - } - - /** - * Gets the item reuse delay time in seconds. - * @return the reuse delay time - */ - public int getReuseDelay() - { - return _reuseDelay; - } - - /** - * Gets the shared reuse group.
- * Items with the same reuse group will render reuse delay upon those items when used. - * @return the shared reuse group - */ - public int getSharedReuseGroup() - { - return _sharedReuseGroup; - } - - public CommissionItemType getCommissionItemType() - { - return _commissionItemType; - } - - /** - * Usable in HTML windows. - * @return the icon link in client files - */ - public String getIcon() - { - return _icon; - } - - public int getDefaultEnchantLevel() - { - return _defaultEnchantLevel; - } - - public boolean isPetItem() - { - return getItemType() == EtcItemType.PET_COLLAR; - } - - /** - * @param extractableProduct - */ - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - } - - public double getStats(Stat stat, double defaultValue) - { - if (_funcTemplates != null) - { - final FuncTemplate template = _funcTemplates.get(stat); - if ((template != null) && ((template.getFunctionClass() == FuncAdd.class) || (template.getFunctionClass() == FuncSet.class))) - { - return template.getValue(); - } - } - return defaultValue; - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java deleted file mode 100644 index 5618132356..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ /dev/null @@ -1,300 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.Collection; -import java.util.Objects; - -import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * This class contains Item
- * Use to sort Item of : - *
    - *
  • Armor
    • - *
  • EtcItem
    • - *
  • Weapon
    • - *
- * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ - */ -public class WarehouseItem -{ - private final ItemTemplate _item; - private final int _object; - private final long _count; - private final int _owner; - private final int _locationSlot; - private final int _enchant; - private final CrystalType _grade; - private final VariationInstance _augmentation; - private final int _customType1; - private final int _customType2; - private final int _mana; - - private byte _elemAtkType = -2; - private int _elemAtkPower = 0; - - private final int[] _elemDefAttr = - { - 0, - 0, - 0, - 0, - 0, - 0 - }; - - private final int[] _enchantOptions; - private final Collection _soulCrystalOptions; - private final Collection _soulCrystalSpecialOptions; - - private final int _time; - - public WarehouseItem(Item item) - { - Objects.requireNonNull(item); - _item = item.getItem(); - _object = item.getObjectId(); - _count = item.getCount(); - _owner = item.getOwnerId(); - _locationSlot = item.getLocationSlot(); - _enchant = item.getEnchantLevel(); - _customType1 = item.getCustomType1(); - _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); - _augmentation = item.getAugmentation(); - _mana = item.getMana(); - _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; - _elemAtkType = item.getAttackAttributeType().getClientId(); - _elemAtkPower = item.getAttackAttributePower(); - for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) - { - _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); - } - _enchantOptions = item.getEnchantOptions(); - _soulCrystalOptions = item.getSpecialAbilities(); - _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); - } - - /** - * @return the item. - */ - public ItemTemplate getItem() - { - return _item; - } - - /** - * @return the unique objectId. - */ - public int getObjectId() - { - return _object; - } - - /** - * @return the owner. - */ - public int getOwnerId() - { - return _owner; - } - - /** - * @return the location slot. - */ - public int getLocationSlot() - { - return _locationSlot; - } - - /** - * @return the count. - */ - public long getCount() - { - return _count; - } - - /** - * @return the first type. - */ - public int getType1() - { - return _item.getType1(); - } - - /** - * @return the second type. - */ - public int getType2() - { - return _item.getType2(); - } - - /** - * @return the second type. - */ - public ItemType getItemType() - { - return _item.getItemType(); - } - - /** - * @return the ItemId. - */ - public int getItemId() - { - return _item.getId(); - } - - /** - * @return the part of body used with this item. - */ - public long getBodyPart() - { - return _item.getBodyPart(); - } - - /** - * @return the enchant level. - */ - public int getEnchantLevel() - { - return _enchant; - } - - /** - * @return the item grade - */ - public CrystalType getItemGrade() - { - return _grade; - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - public boolean isWeapon() - { - return (_item instanceof Weapon); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise. - */ - public boolean isArmor() - { - return (_item instanceof Armor); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - public boolean isEtcItem() - { - return (_item instanceof EtcItem); - } - - /** - * @return the name of the item - */ - public String getItemName() - { - return _item.getName(); - } - - /** - * @return the augmentation If. - */ - public VariationInstance getAugmentation() - { - return _augmentation; - } - - /** - * @return the name of the item - */ - public String getName() - { - return _item.getName(); - } - - public int getCustomType1() - { - return _customType1; - } - - public int getCustomType2() - { - return _customType2; - } - - public int getMana() - { - return _mana; - } - - public byte getAttackElementType() - { - return _elemAtkType; - } - - public int getAttackElementPower() - { - return _elemAtkPower; - } - - public int getElementDefAttr(byte i) - { - return _elemDefAttr[i]; - } - - public int[] getEnchantOptions() - { - return _enchantOptions; - } - - public Collection getSoulCrystalOptions() - { - return _soulCrystalOptions; - } - - public Collection getSoulCrystalSpecialOptions() - { - return _soulCrystalSpecialOptions; - } - - public int getTime() - { - return _time; - } - - /** - * @return the name of the item - */ - @Override - public String toString() - { - return _item.toString(); - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java deleted file mode 100644 index a568389489..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ /dev/null @@ -1,558 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author UnAfraid - */ -public class AppearanceStone -{ - private final int _id; - private final int _cost; - private final int _visualId; - private final long _lifeTime; - private final AppearanceType _type; - private final WeaponType _weaponType; - private final ArmorType _armorType; - private final AppearanceHandType _handType; - private final AppearanceMagicType _magicType; - private List _crystalTypes; - private List _targetTypes; - private List _bodyParts; - private List _races; - private List _racesNot; - private List _allVisualIds; - - public AppearanceStone(StatSet set) - { - _id = set.getInt("id"); - _visualId = set.getInt("visualId", 0); - _cost = set.getInt("cost", 0); - _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); - _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); - _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); - _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); - _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); - _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); - - final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); - if (targetType != AppearanceTargetType.NONE) - { - addTargetType(targetType); - } - - // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. - final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); - - // If no crystal type is defined, we must add all defaults. - if (crystalType == null) - { - switch (targetType) - { - case ACCESSORY: - case ALL: - { - addCrystalType(CrystalType.NONE); - // fallthrough - } - case WEAPON: - case ARMOR: - { - for (CrystalType cryType : CrystalType.values()) - { - if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) - { - addCrystalType(cryType); - } - } - } - } - } - else - { - addCrystalType(crystalType); - } - - final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); - if (bodyPart != ItemTemplate.SLOT_NONE) - { - addBodyPart(bodyPart); - } - - final Race race = set.getEnum("race", Race.class, Race.NONE); - if (race != Race.NONE) - { - addRace(race); - } - - final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); - if (raceNot != Race.NONE) - { - addRaceNot(raceNot); - } - } - - public int getId() - { - return _id; - } - - public int getVisualId() - { - return _visualId; - } - - public int getCost() - { - return _cost; - } - - public long getLifeTime() - { - return _lifeTime; - } - - public AppearanceType getType() - { - return _type; - } - - public WeaponType getWeaponType() - { - return _weaponType; - } - - public ArmorType getArmorType() - { - return _armorType; - } - - public AppearanceHandType getHandType() - { - return _handType; - } - - public AppearanceMagicType getMagicType() - { - return _magicType; - } - - public void addCrystalType(CrystalType type) - { - if (_crystalTypes == null) - { - _crystalTypes = new ArrayList<>(); - } - _crystalTypes.add(type); - } - - public List getCrystalTypes() - { - return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); - } - - public void addTargetType(AppearanceTargetType type) - { - if (_targetTypes == null) - { - _targetTypes = new ArrayList<>(); - } - _targetTypes.add(type); - } - - public List getTargetTypes() - { - return _targetTypes != null ? _targetTypes : Collections.emptyList(); - } - - public void addBodyPart(long part) - { - if (_bodyParts == null) - { - _bodyParts = new ArrayList<>(); - } - _bodyParts.add(part); - } - - public void addVisualId(AppearanceHolder appearanceHolder) - { - if (_allVisualIds == null) - { - _allVisualIds = new ArrayList<>(); - } - _allVisualIds.add(appearanceHolder); - } - - public List getVisualIds() - { - return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); - } - - public List getBodyParts() - { - return _bodyParts != null ? _bodyParts : Collections.emptyList(); - } - - public void addRace(Race race) - { - if (_races == null) - { - _races = new ArrayList<>(); - } - _races.add(race); - } - - public List getRaces() - { - return _races != null ? _races : Collections.emptyList(); - } - - public void addRaceNot(Race race) - { - if (_racesNot == null) - { - _racesNot = new ArrayList<>(); - } - _racesNot.add(race); - } - - public List getRacesNot() - { - return _racesNot != null ? _racesNot : Collections.emptyList(); - } - - /** - * @param player the actor requesting to use this appearance. - * @param targetItem the item to be modified with this appearance. - * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. - */ - public boolean checkConditions(Player player, Item targetItem) - { - if (targetItem == null) - { - return false; - } - - if (getTargetTypes().isEmpty()) - { - return false; - } - - if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); - return false; - } - - switch (_type) - { - case RESTORE: - { - if (targetItem.getVisualId() == 0) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); - return false; - } - - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - default: - { - // Seems like in retail item with already changed appearance, can be changed again without being restored. - - final AppearanceTargetType targetType = getTargetTypes().get(0); - switch (targetType) - { - case NONE: - { - return false; - } - case WEAPON: - { - if (!targetItem.isWeapon()) - { - player.sendPacket(SystemMessageId.WEAPONS_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ARMOR: - { - if (!targetItem.isArmor()) - { - player.sendPacket(SystemMessageId.ARMOR_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ACCESSORY: - { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) - { - player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); - return false; - } - break; - } - case ALL: - { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (findVisualChange(targetItem) == null) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - return true; - } - } - break; - } - } - - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (_weaponType != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) - { - if (_weaponType != WeaponType.CROSSBOW) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - } - - switch (_handType) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - } - - switch (_magicType) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - if (_armorType != ArmorType.NONE) - { - switch (_armorType) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - return true; - } - - public AppearanceHolder findVisualChange(Item targetItem) - { - for (AppearanceHolder holder : _allVisualIds) - { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) - { - continue; - } - - if (holder.getWeaponType() != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) - { - if (holder.getWeaponType() != WeaponType.CROSSBOW) - { - continue; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - continue; - } - } - - switch (holder.getHandType()) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - continue; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - continue; - } - break; - } - } - - switch (holder.getMagicType()) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - continue; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - continue; - } - } - } - } - - if (holder.getArmorType() != ArmorType.NONE) - { - switch (holder.getArmorType()) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - continue; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - continue; - } - } - } - } - return holder; - } - return null; - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java deleted file mode 100644 index 6745b1d5e4..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ /dev/null @@ -1,212 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.logging.Logger; - -import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public abstract class AbstractEnchantItem -{ - protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); - - private static final ItemType[] ENCHANT_TYPES = new ItemType[] - { - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - EtcItemType.BLESS_ENCHT_AM, - EtcItemType.BLESS_ENCHT_AM_DOWN, - EtcItemType.BLESS_ENCHT_WP, - EtcItemType.ENCHT_AM, - EtcItemType.ENCHT_WP, - EtcItemType.ENCHT_WP_DOWN, - EtcItemType.ENCHT_AM_DOWN, - EtcItemType.GIANT_ENCHT_AM, - EtcItemType.GIANT_ENCHT_WP, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - }; - - private final int _id; - private final CrystalType _grade; - private final int _minEnchantLevel; - private final int _maxEnchantLevel; - private final int _safeEnchantLevel; - private final int _randomEnchantMin; - private final int _randomEnchantMax; - private final double _bonusRate; - - public AbstractEnchantItem(StatSet set) - { - _id = set.getInt("id"); - if (getItem() == null) - { - throw new NullPointerException(); - } - else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) - { - throw new IllegalAccessError(); - } - _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); - _minEnchantLevel = set.getInt("minEnchant", 0); - _maxEnchantLevel = set.getInt("maxEnchant", 127); - _safeEnchantLevel = set.getInt("safeEnchant", 0); - _randomEnchantMin = set.getInt("randomEnchantMin", 1); - _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); - _bonusRate = set.getDouble("bonusRate", 0); - } - - /** - * @return id of current item - */ - public int getId() - { - return _id; - } - - /** - * @return bonus chance that would be added - */ - public double getBonusRate() - { - return _bonusRate; - } - - /** - * @return {@link ItemTemplate} current item/scroll - */ - public ItemTemplate getItem() - { - return ItemTable.getInstance().getTemplate(_id); - } - - /** - * @return grade of the item/scroll. - */ - public CrystalType getGrade() - { - return _grade; - } - - /** - * @return {@code true} if scroll is for weapon, {@code false} for armor - */ - public abstract boolean isWeapon(); - - /** - * @return the minimum enchant level that this scroll/item can be used with - */ - public int getMinEnchantLevel() - { - return _minEnchantLevel; - } - - /** - * @return the maximum enchant level that this scroll/item can be used with - */ - public int getMaxEnchantLevel() - { - return _maxEnchantLevel; - } - - /** - * @return the safe enchant level of this scroll/item - */ - public int getSafeEnchant() - { - return _safeEnchantLevel; - } - - /** - * @return the minimum random enchant level of this scroll/item - */ - public int getRandomEnchantMin() - { - return _randomEnchantMin; - } - - /** - * @return the maximum random enchant level of this scroll/item - */ - public int getRandomEnchantMax() - { - return _randomEnchantMax; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem - * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise - */ - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if (itemToEnchant == null) - { - return false; - } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) - { - return false; - } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) - { - return false; - } - else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) - { - return false; - } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) - { - return false; - } - return true; - } - - /** - * @param type2 - * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise - */ - private boolean isValidItemType(int type2) - { - if (type2 == ItemTemplate.TYPE2_WEAPON) - { - return isWeapon(); - } - else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) - { - return !isWeapon(); - } - return false; - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fe698d8e2a..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private long _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(long slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java deleted file mode 100644 index f543c70ebd..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.HashSet; -import java.util.Set; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.data.xml.EnchantItemData; -import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author UnAfraid - */ -public class EnchantScroll extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isBlessedDown; - private final boolean _isSafe; - private final boolean _isGiant; - private final int _scrollGroupId; - private Set _items; - - public EnchantScroll(StatSet set) - { - super(set); - _scrollGroupId = set.getInt("scrollGroupId", 0); - - final ItemType type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN); - _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - /** - * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will reset to 0), {@code false} otherwise - */ - public boolean isBlessed() - { - return _isBlessed; - } - - /** - * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise - */ - public boolean isBlessedDown() - { - return _isBlessedDown; - } - - /** - * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise - */ - public boolean isSafe() - { - return _isSafe; - } - - public boolean isGiant() - { - return _isGiant; - } - - /** - * @return id of scroll group that should be used - */ - public int getScrollGroupId() - { - return _scrollGroupId; - } - - /** - * Enforces current scroll to use only those items as possible items to enchant - * @param itemId - */ - public void addItem(int itemId) - { - if (_items == null) - { - _items = new HashSet<>(); - } - _items.add(itemId); - } - - public Set getItems() - { - return _items; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem the support item used when enchanting (can be null) - * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise - */ - @Override - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if ((_items != null) && !_items.contains(itemToEnchant.getId())) - { - return false; - } - else if ((supportItem != null)) - { - if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed())) - { - return false; - } - else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant())) - { - return false; - } - else if (!supportItem.isValid(itemToEnchant, supportItem)) - { - return false; - } - else if (supportItem.isWeapon() != isWeapon()) - { - return false; - } - } - if (_items == null) - { - for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls()) - { - if (scroll.getId() == getId()) - { - continue; - } - final Set scrollItems = scroll.getItems(); - if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId())) - { - return false; - } - } - } - return super.isValid(itemToEnchant, supportItem); - } - - /** - * @param player - * @param enchantItem - * @return the chance of current scroll's group. - */ - public double getChance(Player player, Item enchantItem) - { - if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); - return -1; - } - - final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); - if (group == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); - return -1; - } - - if ((getSafeEnchant() > 0) && (enchantItem.getEnchantLevel() < getSafeEnchant())) - { - return 100; - } - - return group.getChance(enchantItem.getEnchantLevel()); - } - - /** - * @param player - * @param enchantItem - * @param supportItem - * @return the total chance for success rate of this scroll - */ - public EnchantResultType calculateSuccess(Player player, Item enchantItem, EnchantSupportItem supportItem) - { - if (!isValid(enchantItem, supportItem)) - { - return EnchantResultType.ERROR; - } - - final double chance = getChance(player, enchantItem); - if (chance == -1) - { - return EnchantResultType.ERROR; - } - - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); - final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; - final double bonusRate = getBonusRate(); - final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; - final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100); - final double random = 100 * Rnd.nextDouble(); - final boolean success = (random < finalChance) || player.tryLuck(); - return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE; - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java deleted file mode 100644 index 12b33e468f..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public class EnchantSupportItem extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isDown; - private final boolean _isGiant; - private final ItemType type; - - public EnchantSupportItem(StatSet set) - { - super(set); - type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.ENCHT_WP_DOWN) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isDown = (type == EtcItemType.ENCHT_AM_DOWN) || (type == EtcItemType.ENCHT_WP_DOWN); - _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - public boolean isBlessed() - { - return _isBlessed; - } - - public boolean isDown() - { - return _isDown; - } - - public boolean isGiant() - { - return _isGiant; - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java deleted file mode 100644 index 2920bda8fa..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Crystal Type enumerated. - * @author Adry_85 - */ -public enum CrystalType -{ - NONE(0, 0, 0, 0), - D(1, 1458, 11, 90), - C(2, 1459, 6, 45), - B(3, 1460, 11, 67), - A(4, 1461, 20, 145), - S(5, 1462, 25, 250), - S80(6, 1462, 25, 250), - S84(7, 1462, 25, 250), - R(8, 17371, 30, 500), - R95(9, 17371, 30, 500), - R99(10, 17371, 30, 500), - R110(11, 17371, 30, 500), - EVENT(12, 0, 0, 0); - - private final int _level; - private final int _crystalId; - private final int _crystalEnchantBonusArmor; - private final int _crystalEnchantBonusWeapon; - - CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) - { - _level = level; - _crystalId = crystalId; - _crystalEnchantBonusArmor = crystalEnchantBonusArmor; - _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; - } - - /** - * Gets the crystal type ID. - * @return the crystal type ID - */ - public int getLevel() - { - return _level; - } - - /** - * Gets the item ID of the crystal. - * @return the item ID of the crystal - */ - public int getCrystalId() - { - return _crystalId; - } - - public int getCrystalEnchantBonusArmor() - { - return _crystalEnchantBonusArmor; - } - - public int getCrystalEnchantBonusWeapon() - { - return _crystalEnchantBonusWeapon; - } - - public boolean isGreater(CrystalType crystalType) - { - return getLevel() > crystalType.getLevel(); - } - - public boolean isLesser(CrystalType crystalType) - { - return getLevel() < crystalType.getLevel(); - } - - public CrystalType plusLevel(int levelValue) - { - final int level = levelValue + _level; - if (level >= CrystalType.R110.getLevel()) - { - return CrystalType.R110; - } - if (level <= CrystalType.NONE.getLevel()) - { - return CrystalType.NONE; - } - return getByLevel(level); - } - - public static CrystalType getByLevel(int level) - { - for (CrystalType crystalType : values()) - { - if (crystalType.getLevel() == level) - { - return crystalType; - } - } - return null; - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java deleted file mode 100644 index 5730665d9f..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * EtcItem Type enumerated. - */ -public enum EtcItemType implements ItemType -{ - NONE, - SCROLL, - ARROW, - POTION, - SPELLBOOK, - RECIPE, - MATERIAL, - PET_COLLAR, - CASTLE_GUARD, - DYE, - SEED, - SEED2, - HARVEST, - LOTTO, - RACE_TICKET, - TICKET_OF_LORD, - LURE, - CROP, - MATURECROP, - ENCHT_WP, - ENCHT_AM, - ENCHT_AM_DOWN, - ENCHT_WP_DOWN, - GIANT_ENCHT_WP, - GIANT_ENCHT_AM, - BLESS_ENCHT_WP, - BLESS_ENCHT_AM, - BLESS_ENCHT_AM_DOWN, - COUPON, - ELIXIR, - ENCHT_ATTR, - ENCHT_ATTR_CURSED, - BOLT, - ENCHT_ATTR_INC_PROP_ENCHT_WP, - ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_RUNE, - ENCHT_ATTRT_RUNE_SELECT, - TELEPORTBOOKMARK, - CHANGE_ATTR, - SOULSHOT, - SHAPE_SHIFTING_WP, - BLESS_SHAPE_SHIFTING_WP, - SHAPE_SHIFTING_WP_FIXED, - SHAPE_SHIFTING_AM, - BLESS_SHAPE_SHIFTING_AM, - SHAPE_SHIFTING_AM_FIXED, - SHAPE_SHIFTING_HAIRACC, - BLESS_SHAPE_SHIFTING_HAIRACC, - SHAPE_SHIFTING_HAIRACC_FIXED, - RESTORE_SHAPE_SHIFTING_WP, - RESTORE_SHAPE_SHIFTING_AM, - RESTORE_SHAPE_SHIFTING_HAIRACC, - RESTORE_SHAPE_SHIFTING_ALLITEM, - BLESS_INC_PROP_ENCHT_WP, - BLESS_INC_PROP_ENCHT_AM, - CARD_EVENT, - SHAPE_SHIFTING_ALLITEM_FIXED, - MULTI_ENCHT_WP, - MULTI_ENCHT_AM, - MULTI_INC_PROB_ENCHT_WP, - MULTI_INC_PROB_ENCHT_AM, - SOUL_CRYSTAL, - ENSOUL_STONE; - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return 0; - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c807e1298e..0fcb8c33e4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index a43b3964d6..b98f055fe3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/quest/Quest.java index fd9165366d..20fbb1cd5f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -65,8 +65,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skills/Skill.java index dde442a756..269f26165b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 1e3ef93f48..43da93ac47 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java index f6cdf4df7f..80b0c140b1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index da2c567d17..a99ddb2dfe 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 402c603dac..645156f9c1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index ee53743fce..31df739b0f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index c37fedbfb8..068f5c9368 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index ef63d53ef4..0546560e58 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 3eda159a36..c524cb94f1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index ddbf6666c9..c4b2ee6602 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index 45301710ad..e9fb2b0c78 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index e3239d2fe1..37d6a07943 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 557445c4cd..04e9c002c2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 3c8e441156..8548ad1d3a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index cfb6455ad0..31d29ef3dd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 8513b4d0da..1872b6fa54 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -42,8 +42,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 0747b4eb2b..1683715324 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -53,10 +53,10 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 8aa685657e..8ff8d6ef9a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index cb0801a8d5..f8d8826556 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index d6df3726cc..47214311ac 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 0d59d2ff65..e8d7efa6b0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1963944528..15841de161 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 2ca0f283f9..4f351a636b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 6cc03e2c2b..48cdb8e80b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index c956d365f1..a41b731353 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 3cee24bfb0..161b8d0cab 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index ffd0ffbb36..67a4813cec 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java index 3d7c93c85c..c9b6d4dd3a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java @@ -22,8 +22,8 @@ import java.util.Set; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExTryEnchantArtifactResult; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 29f7828f27..a9fd8d923a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 12bc7c708d..79e1193ac0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 8a5f549b6f..5d9ff7b557 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 4759ba7fda..f511a8e30d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 1dca606dcd..36256ab955 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 18485fdbd4..4d3adf25dc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 989d2e582f..2c715b4efb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d7fcffbdb5..4468b67642 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index fca793bdc0..776e7f818f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 95512364b3..bba86e4e86 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.RecipeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 8ac47eea12..5364e67986 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index cb16d5cc7d..cd8e900014 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index de4094b252..db5981de3d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 8bbb0f99ff..899777642d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 61920f471b..f89be1cfcb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 8a2a0b5033..1b5eb14605 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 2019041cd7..b8dca5ea47 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index e054f0f722..65d55dac0c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -38,10 +38,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java index 940b213621..d9a7fcb4cb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyConversion.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.alchemy.AlchemyCraftData; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index 6800a418cc..d257cb06cc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AlchemyResult; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index f144094dda..95a85c269b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java index 1fc0400b59..eafc924a43 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.ActionDataHolder; import org.l2jmobius.gameserver.model.ShortCuts; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java index 9326803882..b602edf72b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.CollectionDataHolder; import org.l2jmobius.gameserver.model.holders.ItemCollectionData; import org.l2jmobius.gameserver.model.holders.PlayerCollectionData; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 80d2ecee11..e5c25df330 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index d8e28130cc..9cc69554c4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 0b67368833..53112870da 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index 08705b38da..f926d90210 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 7ed7806afb..8562dc024b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 03e1f539c4..ac6b8358d4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index e8f3c75825..912dae684a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 25c9792ec1..3220827fbb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusInitPoint.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusInitPoint.java index 81cd4756f2..d907ed3377 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusInitPoint.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusInitPoint.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.homunculus; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java index 6640c82761..dd627f7667 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.PrimeShopRequest; import org.l2jmobius.gameserver.model.holders.LimitShopProductHolder; import org.l2jmobius.gameserver.model.holders.LimitShopRandomCraftReward; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.AccountVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index 0e95eb9b89..cdaefbe360 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51cd76618e..af8b12547e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 626ba1c351..f143a8aec9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 61fd93e55c..6063a54535 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index df2409c89e..0fc5fb1c75 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index 5a7a9c9c3b..a0ba15da9f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.holders.DamageTakenHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 12359bcd17..2cea176d69 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 93588924fe..077f33cb49 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 07725028a6..76375a86f7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c5c1d1141..81a384642c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index e4fb9e4160..b65005003d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 51abfa9d3e..f49138fafe 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 809a864983..395487097c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 2fe9967302..30dc837721 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 6691a8ea4f..cf3d83263f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 97b7b53cae..cb1379ac29 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index f826c75d4b..844fad86c7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index bd768c74e2..c4598a72e6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index c94eae4c08..00d7618d34 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ced39204d3..fbb5c84dfe 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4068629bde..d05590cbde 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 0e6211e63b..358ee2361b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index d48b66c6ef..9d9b24a54f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c742d534c4..c59568bf1d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index a22b36335e..35ca986d35 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 271ec4401b..37150ec357 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java index db11b2a9b4..d4351a66f9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 6b8cd1358f..c32d4f7c04 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index ca4e7b7f5f..c1b8163a93 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro; /** diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 7553a3233e..fb0db44e8e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Guard; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/DocumentBase.java index c009919c53..7376c5da59 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -136,9 +139,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/EvaBox.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/EvaBox.java index 4bf0778552..98ea658b32 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/EvaBox.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/EvaBox.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/ZombieGatekeepers.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/ZombieGatekeepers.java index ed37c10e6f..26f557fc7b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/ZombieGatekeepers.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/ZombieGatekeepers.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; public class ZombieGatekeepers extends Quest diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java index 22fa1f37a7..da0324f5f8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java index 3e0e19861b..9877f1d318 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java index 68b9d5db76..6bf5c5cc9a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java @@ -19,8 +19,8 @@ package quests.Q415_PathToAMonk; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java index 7bf1c69934..27819e20bc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java index a1b632972e..411d248f58 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -49,8 +49,8 @@ import org.l2jmobius.gameserver.model.actor.instance.NpcWalker; import org.l2jmobius.gameserver.model.actor.instance.PenaltyMonster; import org.l2jmobius.gameserver.model.actor.instance.RaidBoss; import org.l2jmobius.gameserver.model.actor.instance.RiftInvader; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.spawn.Spawn; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/CreatureAI.java index fd921a0fa7..bb2d06b10c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -35,10 +35,10 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; import org.l2jmobius.gameserver.model.actor.instance.Door; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/ItemTable.java index 65e49f36ee..fc50748e92 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -40,12 +40,12 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.RaidBoss; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; import org.l2jmobius.gameserver.util.DocumentItem; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SkillTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SkillTable.java index 996ea3a973..19bb8a8367 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SkillTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/SkillTable.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.util.DocumentSkill; public class SkillTable diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java index 3e31c81362..8edfcf9217 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java @@ -28,7 +28,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StoreTradeList; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * This class manages buylists from database diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/HennaData.java index db5bca03e5..4fcec57764 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * This class loads and stores {@link Henna}s infos. Hennas are called "dye" ingame. diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ManorSeedData.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ManorSeedData.java index d5c0349e28..d1f2718f2c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ManorSeedData.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ManorSeedData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SeedDataHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * This class loads and stores manor seed information. diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index b3fd0df250..9ecf99153b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -29,10 +29,10 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.multisell.MultiSellEntry; import org.l2jmobius.gameserver.model.multisell.MultiSellIngredient; import org.l2jmobius.gameserver.model.multisell.MultiSellListContainer; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ZoneData.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ZoneData.java index 2ba6aac668..b5313ddeaf 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ZoneData.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/ZoneData.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRespawn; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.model.zone.form.ZoneCuboid; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 0bf8de4dc7..3197913235 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.handler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public interface IItemHandler { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java index 1740f0ce83..b5c6edcfa8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDestroyItems.java index 58f32a263e..7f4fa9504f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java index 0d82dfef07..a957d09d48 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java @@ -43,8 +43,8 @@ import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEnchant.java index 11a124c711..09615b2818 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEnchant.java @@ -20,8 +20,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSoulShot.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSoulShot.java index 949f3b380a..b497c0cccd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSoulShot.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.BabyPet; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java index ceeac3916e..e7cb0380ce 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class BeastSpice implements IItemHandler diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpiritShot.java index 1c8e1a1b91..995a6e8ade 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpiritShot.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.BabyPet; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BlessedSpiritShot.java index 041606ddf4..d28cebccd9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BlessedSpiritShot.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Book.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Book.java index 754a4bfcef..0aa3379fa8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Book.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.RadarControl; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BreakingArrow.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BreakingArrow.java index a54dc22211..f78ef4d15a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BreakingArrow.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BreakingArrow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CharChangePotions.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CharChangePotions.java index 4756b6e91b..4db0047819 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CharChangePotions.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CharChangePotions.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java index 871ca2c3c3..bd48bad442 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java index d6fcf6e675..2c7aae93e9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.spawn.Spawn; public class ChristmasTree implements IItemHandler diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CompBlessedSpiritShotPacks.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CompBlessedSpiritShotPacks.java index bc141ed54f..a536ccd0a2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CompBlessedSpiritShotPacks.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CompBlessedSpiritShotPacks.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CompShotPacks.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CompShotPacks.java index 89a2d8b9bb..9acf1bfaa3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CompShotPacks.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CompShotPacks.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CompSpiritShotPacks.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CompSpiritShotPacks.java index 326cb671a9..877c6de200 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CompSpiritShotPacks.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CompSpiritShotPacks.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CrystalCarol.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CrystalCarol.java index 6886665a6e..e8d409aa0c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CrystalCarol.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CrystalCarol.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; public class CrystalCarol implements IItemHandler diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java index ecc8d2b830..8d3733343e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java index a4832222d3..9c0b493794 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnchantScrolls.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnchantScrolls.java index 9eea817c5d..1442e5f836 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnchantScrolls.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java index 06630c450a..b5833df2a9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.effects.EffectCharge; import org.l2jmobius.gameserver.model.skills.handlers.SkillCharge; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java index e63bdc76ce..262a9fa0a6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.ExtractableItem; import org.l2jmobius.gameserver.model.ExtractableProductItem; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java index c20c3f45f9..2754c1bbe5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/FishShots.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/FishShots.java index c19b98036a..c941473d00 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/FishShots.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/FishShots.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java index f06074da8e..3e9e535a40 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java index d4cd553a74..772152c5d1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class HeroCustomItem implements IItemHandler diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java index 516ebfbda7..55327bfb2f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Gourd; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.spawn.Spawn; public class JackpotSeed implements IItemHandler diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java index 723f210bb8..502e524e27 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Door; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MapForestOfTheDead.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MapForestOfTheDead.java index c979f6e174..1138896692 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MapForestOfTheDead.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MapForestOfTheDead.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class MapForestOfTheDead implements IItemHandler diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Maps.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Maps.java index e0fd9a8b7c..63f5fef535 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Maps.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Maps.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.RadarControl; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MercTicket.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MercTicket.java index e61a9eb91a..6dc2ddf272 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MercTicket.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MercTicket.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.MercTicketManager; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class MercTicket implements IItemHandler diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MysteryPotion.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MysteryPotion.java index fcf2aa3e81..8e2b029f7a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MysteryPotion.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/MysteryPotion.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java index 9d36271224..5a1fec7b10 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Gourd; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Nectar implements IItemHandler diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/NobleCustomItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/NobleCustomItem.java index fbbbf28f57..94d8581970 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/NobleCustomItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/NobleCustomItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class NobleCustomItem implements IItemHandler diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/PaganKeys.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/PaganKeys.java index a1574cfdec..8b65cb9f75 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/PaganKeys.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/PaganKeys.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Door; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java index dbdcc664c3..73e46e118b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java index 5975698e93..5d5118e310 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java index 8e0c42338d..c226aaa71b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/RollingDice.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/RollingDice.java index be4b368f70..51858c2d24 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/RollingDice.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java index 142f124f32..20b37f347e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.SetupGauge; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java index 7996e174cf..d4b492e2d7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java index 38dfc98f3d..f09f59dffa 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java index 3f5955cc63..c59d56e273 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.actor.instance.RaidBoss; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SevenSignsRecord.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SevenSignsRecord.java index 5c1460c549..441b831e0c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SevenSignsRecord.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SevenSignsRecord.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.SSQStatus; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java index a5d9c9b7e1..f8c227c170 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java index ee868037e8..d3ab6b4cd8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SpecialXMas.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SpecialXMas.java index 9637eedd38..3b0b1e12d6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SpecialXMas.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SpiritShot.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SpiritShot.java index 0200137dbd..0eaee06a1f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SpiritShot.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java index ed98f3bde9..a8b834f71c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java index d1a2ff3258..60eb7924e5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Servitor; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.skills.BaseStat; import org.l2jmobius.gameserver.model.skills.Formulas; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java index c604e5fff3..76c50cdfa5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java @@ -28,10 +28,10 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.zone.type.FishingZone; import org.l2jmobius.gameserver.model.zone.type.WaterZone; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java index f839c59adf..549e3579b7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java index c4ebbcfaac..09aa955651 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable.RewardItem; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java index 75b41b4dd2..5a7c87d7c0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BaseStat; import org.l2jmobius.gameserver.model.skills.Formulas; import org.l2jmobius.gameserver.model.skills.effects.EffectCharge; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java index a64fa8c9d4..2ed1fd9039 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java index 9e31fe8534..4c209e76a7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Door; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Formulas; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java index 483db11de7..be9c806696 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable.RewardItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index fcc16687ae..ab840e2c00 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java index a6f90c911a..e1a7739d48 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/CrownManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/CrownManager.java index 61fc86b9f7..deb467ef47 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/CrownManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/CrownManager.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.data.CrownTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java index f3406236fc..ee9c7367ef 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.DimensionalRift; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index fb84762f3f..d683e61f3e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -41,7 +41,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.SepulcherMonster; import org.l2jmobius.gameserver.model.actor.instance.SepulcherNpc; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.model.zone.type.BossZone; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index aee6106372..ca02cfb172 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -30,8 +30,8 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java index 79945df01b..734b15f78a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeGuard; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java index d890234848..6a0af1c1e4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index e89b51ded5..28826e805f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -33,8 +33,8 @@ import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java index 1706b77e30..ae3161fc71 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StoreTradeList; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java index 3e05e331fd..6e9aa02c2c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ArmorSet.java index bcfd132569..cd6b554590 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Luno diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/CombatFlag.java index 7c775e8c1c..c3f48be791 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ItemInfo.java index a4c3a6fda8..8a4f510f0d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -16,8 +16,8 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Party.java index 3219d8a0a0..fd656792b8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Party.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ShortCuts.java index 17d0525fd2..99279ba979 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/StoreTradeList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/StoreTradeList.java index bda8ee495e..c3160765b4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/StoreTradeList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/StoreTradeList.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @version $Revision: 1.4.2.1.2.5 $ $Date: 2005/03/27 15:29:33 $ diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java index 76780a04a5..5bbc8d13a6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java @@ -25,10 +25,10 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/WorldObject.java index c438598649..de39871515 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/WorldObject.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/WorldObject.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.MercTicketManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.knownlist.WorldObjectKnownList; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.GetItem; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java index e687888035..063107b27a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -51,9 +51,9 @@ import org.l2jmobius.gameserver.model.actor.instance.SiegeGuard; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.knownlist.AttackableKnownList; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.skills.Stat; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java index df1941744f..139deb3eb1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -80,10 +80,10 @@ import org.l2jmobius.gameserver.model.actor.status.CreatureStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java index 067808a2f9..0bd2c88cb1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -65,10 +65,10 @@ import org.l2jmobius.gameserver.model.actor.status.NpcStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.HelperBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java index 4406781550..939447c333 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -129,20 +129,20 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.holders.PlayerStatsHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java index 0d1a2cfe7e..d7dcb8ccf7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.actor.knownlist.SummonKnownList; import org.l2jmobius.gameserver.model.actor.stat.SummonStat; import org.l2jmobius.gameserver.model.actor.status.SummonStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java index b26aca43a8..f92472935d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @version $Revision: 1.15.2.10.2.16 $ $Date: 2005/04/06 16:13:40 $ diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Boat.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Boat.java index 5d96f63bbd..4fd4b47939 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Boat.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Boat.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.knownlist.BoatKnownList; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.holders.BoatPathHolder; import org.l2jmobius.gameserver.model.holders.BoatPathHolder.BoatPoint; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.OnVehicleCheckLocation; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClassMaster.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClassMaster.java index 23a401a41d..3989bd3cc7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClassMaster.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClassMaster.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.PlayerTemplateData; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index d7840d2b96..0310f06333 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -41,8 +41,8 @@ import org.l2jmobius.gameserver.model.actor.stat.DoorStat; import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FakePlayer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FakePlayer.java index c53337e774..553e8bf7d1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FakePlayer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FakePlayer.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.FakePlayerTable; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * This class manages Fake Player instances, they look like regular players. This effect will show up on all clients. diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuide.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuide.java index 7b8d35edd8..7f6a18f936 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuide.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuide.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java index 105272b59b..68f6c5f5c6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManager.java index 6c9fc982b3..875f369da7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManager.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.Ride; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ManorManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ManorManager.java index fbcbe751d6..b201b87aeb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ManorManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ManorManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.BuyList; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManager.java index 3affe71fa5..45ac01514c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExHeroList; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index d6b5075c90..3f62118e22 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -38,12 +38,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index 1e1087e633..97dd6a4418 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.HistoryInfo; import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java index 06b6fb0278..d391d5fed8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java index 198107fe4a..2aee4ec685 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 13d6f90c4f..757441a658 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.StopMove; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManager.java index d9b22ad308..bb539bb652 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManager.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/knownlist/PlayerKnownList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/knownlist/PlayerKnownList.java index 991236d458..7690aee611 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/knownlist/PlayerKnownList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/knownlist/PlayerKnownList.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Fence; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.StaticObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; import org.l2jmobius.gameserver.network.serverpackets.DoorInfo; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/Armor.java index bc2a4771a3..1008e0f468 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Collections; @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Env; import org.l2jmobius.gameserver.model.skills.funcs.Func; import org.l2jmobius.gameserver.model.skills.funcs.FuncTemplate; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/EtcItem.java similarity index 91% rename from L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/EtcItem.java rename to L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/EtcItem.java index a3da891f26..07e54ad2a2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; /** * This class is dedicated to the management of EtcItem. diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/Henna.java similarity index 94% rename from L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Henna.java rename to L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/Henna.java index c79fb4f229..2c8f7e5616 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.StatSet; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index 221496854d..4f0949fb6c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Collections; @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Env; import org.l2jmobius.gameserver.model.skills.effects.EffectTemplate; import org.l2jmobius.gameserver.model.skills.funcs.Func; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/Weapon.java similarity index 95% rename from L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Weapon.java rename to L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/Weapon.java index eca3b6131c..c9d6110da0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Collections; @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.skills.Env; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java index c1e730a7bf..da558e9258 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import java.sql.Connection; import java.sql.PreparedStatement; @@ -39,10 +39,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.knownlist.NullKnownList; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.funcs.Func; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java similarity index 92% rename from L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java rename to L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java index 30731612f6..0ff78eb595 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Description of Armor Type diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index 2b61bcb46e..37fbffe08c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Description of EtcItem Type diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/type/ItemType.java similarity index 91% rename from L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/type/ItemType.java rename to L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/type/ItemType.java index d96dfc81af..26f81b0e94 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Created for allow comparing different item types diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java similarity index 93% rename from L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename to L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java index b3ba1cd9cc..10380af268 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Weapon Type enumerated. diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 0c38012cb8..ca2556374a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 82320b67cf..fce0b94f65 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -31,14 +31,14 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * This class manages inventory diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 3b86692bdc..1d2f5522b5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,9 +34,9 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; /** * @author Advi diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index d8bbf72558..b4720b3639 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerFreight.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerFreight.java index 053c073df6..aaf829e25f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerFreight.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerFreight.java @@ -21,8 +21,8 @@ import java.util.Collection; import java.util.List; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; public class PlayerFreight extends ItemContainer { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 63d1f205e2..312cb449e9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -26,11 +26,11 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.TradeList.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; public class PlayerInventory extends Inventory { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerWarehouse.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerWarehouse.java index d1a4429800..c8bb572e84 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerWarehouse.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerWarehouse.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; public class PlayerWarehouse extends Warehouse { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index c4a1005af7..8d7ecdd7c5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index 12efbe4240..d53a1e3da1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Cubic; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.instance.TamedBeast; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad.COMP_TYPE; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/QuestState.java index cd450ec800..a2bd6dc8f9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.DropData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java index 3a44e862b4..ec9fb7cbb3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java @@ -48,7 +48,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FestivalMonster; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.model.spawn.SpawnListener; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java index 46c476b963..7f43d0ae67 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Deco; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.ClanHallSiege; import org.l2jmobius.gameserver.model.zone.type.ClanHallZone; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java index 9d899b4324..37f3b213ad 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Deco; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.ClanHallSiege; import org.l2jmobius.gameserver.model.zone.type.ClanHallZone; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/Env.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/Env.java index 0b3a643cdd..b17643c1ef 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/Env.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/Env.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.skills; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author ProGramMoS, eX1steam, An Env object is just a class to pass parameters to a calculator such as Player, Item, Initial value. diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/Formulas.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/Formulas.java index da3965ce2f..54e542f092 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/Formulas.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/Formulas.java @@ -37,12 +37,12 @@ import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemId.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemId.java index 72355f82f6..dd814f4665 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.skills.conditions; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Env; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemType.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemType.java index ab643cc264..7201971029 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.skills.conditions; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Env; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetBodyPart.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetBodyPart.java index c084da8c92..7f212e1032 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetBodyPart.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetBodyPart.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.skills.conditions; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Env; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetUsesWeaponKind.java index 225415698d..43ea1688d9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetUsesWeaponKind.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.skills.conditions; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Env; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingItemType.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingItemType.java index 690b9f70c0..708f1d581f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.skills.conditions; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Env; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/funcs/FuncEnchant.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/funcs/FuncEnchant.java index 89098a5fa8..aa51dabe2e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/funcs/FuncEnchant.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/funcs/FuncEnchant.java @@ -18,9 +18,9 @@ package org.l2jmobius.gameserver.model.skills.funcs; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Env; import org.l2jmobius.gameserver.model.skills.Stat; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java index 46c6f6e348..4ca7ab9a82 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BaseStat; import org.l2jmobius.gameserver.model.skills.Formulas; import org.l2jmobius.gameserver.model.skills.effects.EffectCharge; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index 8281a139ad..0c9b1985fa 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -20,7 +20,7 @@ import java.awt.geom.Line2D; import org.l2jmobius.gameserver.data.xml.ZoneData; import org.l2jmobius.gameserver.instancemanager.IdManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java index 767b4f0330..b593a64116 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 0928178ed2..34beb982bc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -36,8 +36,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6c5d1787ff..a2408a970b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -50,7 +50,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ClassMaster; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 9545490366..811909c9f8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -25,11 +25,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.multisell.MultiSellEntry; import org.l2jmobius.gameserver.model.multisell.MultiSellIngredient; import org.l2jmobius.gameserver.model.multisell.MultiSellListContainer; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java index a97d4c7d71..77420b22cd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Fisherman; import org.l2jmobius.gameserver.model.actor.instance.Folk; import org.l2jmobius.gameserver.model.actor.instance.VillageMaster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExStorageMaxCount; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 18b30c95b9..2d56a2ee12 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index a2a89d4b79..226cf9c155 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.instance.ClanHallManager; import org.l2jmobius.gameserver.model.actor.instance.Fisherman; import org.l2jmobius.gameserver.model.actor.instance.MercManager; import org.l2jmobius.gameserver.model.actor.instance.Merchant; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java index 245836e09a..84da339bd3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ManorManager; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 29348b9efe..0826abeb46 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProductio import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ManorManager; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java index cf372323d4..c3e9a01bc6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.data.sql.PetNameTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index f7262935c2..451f2edc9a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 7a02d3f44d..72bfdb6c83 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.PetDataTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index d0cb52afcb..22cd995a9d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 24ba8cc15c..f95a501934 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -22,9 +22,9 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 0e47ae7e6b..598c84af42 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Folk; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 9738f83acc..15a0221fdf 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.IllegalPlayerAction; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index f313a259f2..bccc1ae5c2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 2d5d44b963..a867d9b1e5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.HennaItemInfo; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 947dd691da..70e6c23afb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 7eeb40f443..77f15b2cf8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index d8a1351b7a..2408c6ff89 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.data.xml.BoatData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index edd542c264..b89d919e6e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Folk; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index 0747f6a8e3..296ecb1e36 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index df39890020..b1c6096b49 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetInfo; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index ab4479bcf1..d57f65b7f9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.model.ItemRequest; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.TradeList.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index de743e0151..d45b7c5808 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ManorManager; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java index 9ab9d34b10..86a18d56e9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Boat; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.StaticObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; import org.l2jmobius.gameserver.network.serverpackets.DoorInfo; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 98f2092059..5e65234350 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Fisherman; import org.l2jmobius.gameserver.model.actor.instance.Merchant; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 1300e42fd8..23adf15677 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java index 9612908d1c..132e0e5d2f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.MercManager; import org.l2jmobius.gameserver.model.actor.instance.Merchant; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 731388830a..31e1a53f7b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Folk; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 9b364d5199..a99759e0b6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Folk; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index ad9b1ccd1c..dd7d180b66 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index 9b83f5a5c1..29bad6b104 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.StoreTradeList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index 80d5c61b1e..6579adce9e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.StoreTradeList; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 95c51c5c98..a508f44167 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java index ba918f7c3a..a6c77b97fe 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 8352b4ac9e..2c74c771dc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ManorSeedData; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java index ce3b2cb689..f1d59034a7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewHennaInfo implements IClientOutgoingPacket diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index 858aea78cc..042d78a632 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 1cad3f709a..65e67c537d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,9 +21,9 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index a82ae17cf5..717b548b8d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 930df2d253..0319e3a4fa 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; public class HennaEquipList implements IClientOutgoingPacket diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 4cf17377e7..1146173d86 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; public class HennaInfo implements IClientOutgoingPacket diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java index 99126f35f2..ff97978c0d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; public class HennaItemInfo implements IClientOutgoingPacket diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 3ecc98a386..bbfd432bfc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; public class HennaItemRemoveInfo implements IClientOutgoingPacket diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 3598bfa25f..e7a130fff6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; public class HennaRemoveList implements IClientOutgoingPacket diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 96c87c4017..091aeaa54d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index 6b755c06a8..f492155d0d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index 03ef70c9ae..022ace542b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index b0652e97a8..010728605d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 84598cc24e..2ab73d789c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4e864e250a..c22b960801 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.TradeList.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java index de26e9b9b1..6ff29a30a1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 54467b34a6..8928185ce9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -26,7 +26,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 9d6313507c..213fe06beb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 4983598918..80aa78ab2a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index 215fa9b959..7320188d2d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.TradeList.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index e94ee79871..813920b5cb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index cf5e2e32b1..777e9bb07f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java index c311955728..608eb9a006 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.StoreTradeList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WearList implements IClientOutgoingPacket diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index d480732216..b1cbe62f30 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index b68bf7aa5d..1925005382 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentBase.java index e01bfe27a9..27cad8629b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Env; import org.l2jmobius.gameserver.model.skills.Stat; import org.l2jmobius.gameserver.model.skills.conditions.Condition; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentItem.java index 3650c8f20d..ed98b13558 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -27,13 +27,13 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author mkizub, JIV diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/log/filter/ItemFilter.java index ce7f360a0f..4e6ae82f63 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,8 +21,8 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; /** * @author Advi diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/GameStatusThread.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/GameStatusThread.java index f285544ed6..1e0fa63f44 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/GameStatusThread.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/telnet/GameStatusThread.java @@ -73,8 +73,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Monster; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java index feb6adc075..a930090b9e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.spawn.Spawn; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java index 4bf0778552..98ea658b32 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; /** diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ZombieGatekeepers.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ZombieGatekeepers.java index ed37c10e6f..26f557fc7b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ZombieGatekeepers.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ZombieGatekeepers.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; public class ZombieGatekeepers extends Quest diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java index 22fa1f37a7..da0324f5f8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java index 3e0e19861b..9877f1d318 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java index a73c36905e..195cd3ec02 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java @@ -19,8 +19,8 @@ package quests.Q415_PathToAMonk; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java index 7bf1c69934..27819e20bc 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java index b08530ce94..eba6947443 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java index a1b632972e..411d248f58 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -49,8 +49,8 @@ import org.l2jmobius.gameserver.model.actor.instance.NpcWalker; import org.l2jmobius.gameserver.model.actor.instance.PenaltyMonster; import org.l2jmobius.gameserver.model.actor.instance.RaidBoss; import org.l2jmobius.gameserver.model.actor.instance.RiftInvader; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.spawn.Spawn; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java index fd921a0fa7..bb2d06b10c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -35,10 +35,10 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; import org.l2jmobius.gameserver.model.actor.instance.Door; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStop; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java index 65e49f36ee..fc50748e92 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -40,12 +40,12 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.RaidBoss; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; import org.l2jmobius.gameserver.util.DocumentItem; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SkillTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SkillTable.java index 996ea3a973..19bb8a8367 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SkillTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/SkillTable.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.util.DocumentSkill; public class SkillTable diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java index 3e31c81362..8edfcf9217 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/sql/TradeListTable.java @@ -28,7 +28,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StoreTradeList; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * This class manages buylists from database diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/AugmentationData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/AugmentationData.java index 295034cd68..45be8ab573 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/AugmentationData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/AugmentationData.java @@ -35,7 +35,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Augmentation; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Stat; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/HennaData.java index db5bca03e5..4fcec57764 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * This class loads and stores {@link Henna}s infos. Hennas are called "dye" ingame. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ManorSeedData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ManorSeedData.java index d5c0349e28..d1f2718f2c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ManorSeedData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ManorSeedData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SeedDataHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * This class loads and stores manor seed information. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index b3fd0df250..9ecf99153b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -29,10 +29,10 @@ import org.w3c.dom.Node; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.multisell.MultiSellEntry; import org.l2jmobius.gameserver.model.multisell.MultiSellIngredient; import org.l2jmobius.gameserver.model.multisell.MultiSellListContainer; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ZoneData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ZoneData.java index 2ba6aac668..b5313ddeaf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ZoneData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/ZoneData.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.WorldRegion; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRespawn; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.model.zone.form.ZoneCuboid; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 0bf8de4dc7..3197913235 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.handler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public interface IItemHandler { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java index 1740f0ce83..b5c6edcfa8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDestroyItems.java index 58f32a263e..7f4fa9504f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java index 0d82dfef07..a957d09d48 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java @@ -43,8 +43,8 @@ import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEnchant.java index 11a124c711..09615b2818 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEnchant.java @@ -20,8 +20,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSoulShot.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSoulShot.java index 949f3b380a..b497c0cccd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSoulShot.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.BabyPet; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java index ceeac3916e..e7cb0380ce 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class BeastSpice implements IItemHandler diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpiritShot.java index 1c8e1a1b91..995a6e8ade 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpiritShot.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.BabyPet; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BlessedSpiritShot.java index 041606ddf4..d28cebccd9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BlessedSpiritShot.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Book.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Book.java index c70407b224..63e9441881 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Book.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.RadarControl; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BreakingArrow.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BreakingArrow.java index a54dc22211..f78ef4d15a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BreakingArrow.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BreakingArrow.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CharChangePotions.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CharChangePotions.java index 4756b6e91b..4db0047819 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CharChangePotions.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CharChangePotions.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java index 871ca2c3c3..bd48bad442 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java index d6fcf6e675..2c7aae93e9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChristmasTree.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.spawn.Spawn; public class ChristmasTree implements IItemHandler diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompBlessedSpiritShotPacks.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompBlessedSpiritShotPacks.java index bc141ed54f..a536ccd0a2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompBlessedSpiritShotPacks.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompBlessedSpiritShotPacks.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompShotPacks.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompShotPacks.java index 89a2d8b9bb..9acf1bfaa3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompShotPacks.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompShotPacks.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompSpiritShotPacks.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompSpiritShotPacks.java index 326cb671a9..877c6de200 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompSpiritShotPacks.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CompSpiritShotPacks.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ItemList; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CrystalCarol.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CrystalCarol.java index 6886665a6e..e8d409aa0c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CrystalCarol.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CrystalCarol.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; public class CrystalCarol implements IItemHandler diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java index ecc8d2b830..8d3733343e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java index a4832222d3..9c0b493794 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnchantScrolls.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnchantScrolls.java index 9eea817c5d..1442e5f836 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnchantScrolls.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java index d4c5230f3c..16e5148f9e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.effects.EffectCharge; import org.l2jmobius.gameserver.model.skills.handlers.SkillCharge; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java index e63bdc76ce..262a9fa0a6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.ExtractableItem; import org.l2jmobius.gameserver.model.ExtractableProductItem; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java index c20c3f45f9..2754c1bbe5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/FishShots.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/FishShots.java index c19b98036a..c941473d00 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/FishShots.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/FishShots.java @@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java index f06074da8e..3e9e535a40 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java index d4cd553a74..772152c5d1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/HeroCustomItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class HeroCustomItem implements IItemHandler diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java index 516ebfbda7..55327bfb2f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/JackpotSeed.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Gourd; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.spawn.Spawn; public class JackpotSeed implements IItemHandler diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java index 723f210bb8..502e524e27 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MOSKey.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Door; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MapForestOfTheDead.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MapForestOfTheDead.java index c979f6e174..1138896692 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MapForestOfTheDead.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MapForestOfTheDead.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class MapForestOfTheDead implements IItemHandler diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Maps.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Maps.java index e0fd9a8b7c..63f5fef535 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Maps.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Maps.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.RadarControl; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MercTicket.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MercTicket.java index e61a9eb91a..6dc2ddf272 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MercTicket.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MercTicket.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.MercTicketManager; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class MercTicket implements IItemHandler diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MysteryPotion.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MysteryPotion.java index fcf2aa3e81..8e2b029f7a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MysteryPotion.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MysteryPotion.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java index 9d36271224..5a1fec7b10 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Gourd; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Nectar implements IItemHandler diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/NobleCustomItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/NobleCustomItem.java index fbbbf28f57..94d8581970 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/NobleCustomItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/NobleCustomItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class NobleCustomItem implements IItemHandler diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/PaganKeys.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/PaganKeys.java index a1574cfdec..8b65cb9f75 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/PaganKeys.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/PaganKeys.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Door; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java index 0a3bf65ec3..ecd02dce6f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java index 5975698e93..5d5118e310 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java index 8e0c42338d..c226aaa71b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/RollingDice.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/RollingDice.java index be4b368f70..51858c2d24 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/RollingDice.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java index c2b1679c87..98745055d1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.SetupGauge; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java index 7996e174cf..d4b492e2d7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java index 38dfc98f3d..f09f59dffa 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java index 3f5955cc63..c59d56e273 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.actor.instance.RaidBoss; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SevenSignsRecord.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SevenSignsRecord.java index 5c1460c549..441b831e0c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SevenSignsRecord.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SevenSignsRecord.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.SSQStatus; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java index a5d9c9b7e1..f8c227c170 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java index ee868037e8..d3ab6b4cd8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpecialXMas.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpecialXMas.java index 9637eedd38..3b0b1e12d6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpecialXMas.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpiritShot.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpiritShot.java index 0200137dbd..0eaee06a1f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpiritShot.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java index 29e383f8c4..1e4ce0269a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java index bf746fb509..c535665f27 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Servitor; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.skills.BaseStat; import org.l2jmobius.gameserver.model.skills.Formulas; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java index c604e5fff3..76c50cdfa5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java @@ -28,10 +28,10 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.zone.type.FishingZone; import org.l2jmobius.gameserver.model.zone.type.WaterZone; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java index f839c59adf..549e3579b7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/FishingSkill.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java index c4ebbcfaac..09aa955651 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable.RewardItem; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java index 1aaec06183..ed75578935 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BaseStat; import org.l2jmobius.gameserver.model.skills.Formulas; import org.l2jmobius.gameserver.model.skills.effects.EffectCharge; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java index a64fa8c9d4..2ed1fd9039 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sow.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.PlaySound; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java index 9e31fe8534..4c209e76a7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Door; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Formulas; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java index 483db11de7..be9c806696 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Attackable.RewardItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index fcc16687ae..ab840e2c00 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java index a6f90c911a..e1a7739d48 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ChristmasManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CrownManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CrownManager.java index 61fc86b9f7..deb467ef47 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CrownManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CrownManager.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.data.CrownTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 50a54e864e..d194f619b5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortSiegeGuard; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.RiftInvader; import org.l2jmobius.gameserver.model.actor.instance.SiegeGuard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java index f3406236fc..ee9c7367ef 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.DimensionalRift; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index fb84762f3f..d683e61f3e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -41,7 +41,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.SepulcherMonster; import org.l2jmobius.gameserver.model.actor.instance.SepulcherNpc; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.model.zone.type.BossZone; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 4bc8ee5344..b659598212 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -30,8 +30,8 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java index 79945df01b..734b15f78a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeGuard; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java index d890234848..6a0af1c1e4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RebirthManager.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 862924a732..b8cd016274 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -33,8 +33,8 @@ import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java index 1706b77e30..ae3161fc71 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/TradeManager.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StoreTradeList; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java index 3e05e331fd..6e9aa02c2c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -29,7 +29,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.AnnouncementsTable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ArmorSet.java index bcfd132569..cd6b554590 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Luno diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Augmentation.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Augmentation.java index 5653b46ad2..3be8d6c0d7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Augmentation.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Augmentation.java @@ -26,7 +26,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.xml.AugmentationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Stat; import org.l2jmobius.gameserver.model.skills.funcs.FuncAdd; import org.l2jmobius.gameserver.model.skills.funcs.LambdaConst; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java index 7c775e8c1c..c3f48be791 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 2f282a59bc..d4690d8044 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Earthquake; import org.l2jmobius.gameserver.network.serverpackets.ExRedSky; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java index 8e4b2f08aa..a983dd104e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -16,8 +16,8 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java index d2df6f7d8a..58d32c6138 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java index 17d0525fd2..99279ba979 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StoreTradeList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StoreTradeList.java index bda8ee495e..c3160765b4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StoreTradeList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StoreTradeList.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @version $Revision: 1.4.2.1.2.5 $ $Date: 2005/03/27 15:29:33 $ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java index 82a24789a3..3a38c7d580 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java @@ -25,10 +25,10 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java index c438598649..de39871515 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.MercTicketManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.knownlist.WorldObjectKnownList; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.GetItem; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 1317dfea98..3dd48662f2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -52,9 +52,9 @@ import org.l2jmobius.gameserver.model.actor.instance.SiegeGuard; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.knownlist.AttackableKnownList; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.skills.Stat; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index be5939bc49..bbbe71e1b9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -82,10 +82,10 @@ import org.l2jmobius.gameserver.model.actor.status.CreatureStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java index 7554f6cde9..ba11c7cc60 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -65,10 +65,10 @@ import org.l2jmobius.gameserver.model.actor.status.NpcStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.HelperBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index 049675c054..48ba45222c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -132,20 +132,20 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.holders.PlayerStatsHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java index 0d1a2cfe7e..d7dcb8ccf7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.actor.knownlist.SummonKnownList; import org.l2jmobius.gameserver.model.actor.stat.SummonStat; import org.l2jmobius.gameserver.model.actor.status.SummonStatus; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java index b26aca43a8..f92472935d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @version $Revision: 1.15.2.10.2.16 $ $Date: 2005/04/06 16:13:40 $ diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Boat.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Boat.java index 5d96f63bbd..4fd4b47939 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Boat.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Boat.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.knownlist.BoatKnownList; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.holders.BoatPathHolder; import org.l2jmobius.gameserver.model.holders.BoatPathHolder.BoatPoint; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.OnVehicleCheckLocation; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMaster.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMaster.java index 23a401a41d..3989bd3cc7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMaster.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMaster.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.PlayerTemplateData; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index d7840d2b96..0310f06333 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -41,8 +41,8 @@ import org.l2jmobius.gameserver.model.actor.stat.DoorStat; import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FakePlayer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FakePlayer.java index c53337e774..553e8bf7d1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FakePlayer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FakePlayer.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.sql.FakePlayerTable; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * This class manages Fake Player instances, they look like regular players. This effect will show up on all clients. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuide.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuide.java index 7b8d35edd8..7f6a18f936 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuide.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuide.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java index 105272b59b..68f6c5f5c6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManager.java index 6c9fc982b3..875f369da7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManager.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.Ride; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManager.java index fbcbe751d6..b201b87aeb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ManorManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.TradeManager; import org.l2jmobius.gameserver.model.StoreTradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.BuyList; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManager.java index 3affe71fa5..45ac01514c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExHeroList; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 06a2d0d654..2d0d9894b9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -39,12 +39,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index 1e1087e633..97dd6a4418 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.HistoryInfo; import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java index 06b6fb0278..d391d5fed8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java index 198107fe4a..2aee4ec685 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 13d6f90c4f..757441a658 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcInfo; import org.l2jmobius.gameserver.network.serverpackets.StopMove; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManager.java index d9b22ad308..bb539bb652 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManager.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/knownlist/PlayerKnownList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/knownlist/PlayerKnownList.java index 991236d458..7690aee611 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/knownlist/PlayerKnownList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/knownlist/PlayerKnownList.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Fence; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.StaticObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; import org.l2jmobius.gameserver.network.serverpackets.DeleteObject; import org.l2jmobius.gameserver.network.serverpackets.DoorInfo; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/Armor.java index bc2a4771a3..1008e0f468 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Collections; @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Env; import org.l2jmobius.gameserver.model.skills.funcs.Func; import org.l2jmobius.gameserver.model.skills.funcs.FuncTemplate; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/EtcItem.java similarity index 91% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/EtcItem.java index a3da891f26..07e54ad2a2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; /** * This class is dedicated to the management of EtcItem. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/Henna.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/Henna.java index c79fb4f229..2c8f7e5616 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.StatSet; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index ce80c073ac..4f4a86ef24 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Collections; @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.Effect; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Env; import org.l2jmobius.gameserver.model.skills.effects.EffectTemplate; import org.l2jmobius.gameserver.model.skills.funcs.Func; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java index eca3b6131c..c9d6110da0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Collections; @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.EventType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.skills.Env; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java index c02f34f3b7..b066224c8d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import java.sql.Connection; import java.sql.PreparedStatement; @@ -40,10 +40,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.knownlist.NullKnownList; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.funcs.Func; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java similarity index 92% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java index 30731612f6..0ff78eb595 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Description of Armor Type diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 93% rename from L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index 2b61bcb46e..37fbffe08c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Description of EtcItem Type diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/type/ItemType.java similarity index 91% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/ItemType.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/type/ItemType.java index d96dfc81af..26f81b0e94 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Created for allow comparing different item types diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java similarity index 93% rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java index b3ba1cd9cc..10380af268 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Weapon Type enumerated. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 0c38012cb8..ca2556374a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 0ae636610c..24bce386eb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -31,14 +31,14 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * This class manages inventory diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index d78a6b303d..a693d6a1ad 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,9 +34,9 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; /** * @author Advi diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index d8bbf72558..b4720b3639 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerFreight.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerFreight.java index 053c073df6..aaf829e25f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerFreight.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerFreight.java @@ -21,8 +21,8 @@ import java.util.Collection; import java.util.List; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; public class PlayerFreight extends ItemContainer { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 6dfa1f3416..42116361e0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -26,11 +26,11 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.TradeList.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; public class PlayerInventory extends Inventory { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerWarehouse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerWarehouse.java index d1a4429800..c8bb572e84 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerWarehouse.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerWarehouse.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item.ItemLocation; +import org.l2jmobius.gameserver.model.item.instance.Item.ItemLocation; public class PlayerWarehouse extends Warehouse { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index c4a1005af7..8d7ecdd7c5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.PledgeShowInfoUpdate; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index bf0913a7aa..943f9f7416 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Cubic; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.instance.TamedBeast; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad.COMP_TYPE; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java index cd450ec800..a2bd6dc8f9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.DropData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java index 3a44e862b4..ec9fb7cbb3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java @@ -48,7 +48,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FestivalMonster; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.spawn.Spawn; import org.l2jmobius.gameserver.model.spawn.SpawnListener; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java index 46c476b963..7f43d0ae67 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/BanditStrongholdSiege.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Deco; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.ClanHallSiege; import org.l2jmobius.gameserver.model.zone.type.ClanHallZone; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java index 9d899b4324..37f3b213ad 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/siege/clanhalls/WildBeastFarmSiege.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Deco; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.ClanHallSiege; import org.l2jmobius.gameserver.model.zone.type.ClanHallZone; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Env.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Env.java index 0b3a643cdd..b17643c1ef 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Env.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Env.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.skills; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author ProGramMoS, eX1steam, An Env object is just a class to pass parameters to a calculator such as Player, Item, Initial value. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Formulas.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Formulas.java index da3965ce2f..54e542f092 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Formulas.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Formulas.java @@ -37,12 +37,12 @@ import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemId.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemId.java index 72355f82f6..dd814f4665 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.skills.conditions; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Env; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemType.java index ab643cc264..7201971029 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.skills.conditions; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Env; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetBodyPart.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetBodyPart.java index c084da8c92..7f212e1032 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetBodyPart.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetBodyPart.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.model.skills.conditions; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Env; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetUsesWeaponKind.java index 225415698d..43ea1688d9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetUsesWeaponKind.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.skills.conditions; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Env; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingItemType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingItemType.java index 690b9f70c0..708f1d581f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.skills.conditions; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Env; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncEnchant.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncEnchant.java index 89098a5fa8..aa51dabe2e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncEnchant.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/funcs/FuncEnchant.java @@ -18,9 +18,9 @@ package org.l2jmobius.gameserver.model.skills.funcs; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Env; import org.l2jmobius.gameserver.model.skills.Stat; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java index 95136821c5..f285fa88ad 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BaseStat; import org.l2jmobius.gameserver.model.skills.Formulas; import org.l2jmobius.gameserver.model.skills.effects.EffectCharge; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index 8281a139ad..0c9b1985fa 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -20,7 +20,7 @@ import java.awt.geom.Line2D; import org.l2jmobius.gameserver.data.xml.ZoneData; import org.l2jmobius.gameserver.instancemanager.IdManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java index 767b4f0330..b593a64116 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/BossZone.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 0928178ed2..34beb982bc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -36,8 +36,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index a083aeb433..beed4288fc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -50,8 +50,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ClassMaster; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index a725489bba..583f99b2d7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -26,11 +26,11 @@ import org.l2jmobius.gameserver.data.xml.MultisellData; import org.l2jmobius.gameserver.model.Augmentation; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.multisell.MultiSellEntry; import org.l2jmobius.gameserver.model.multisell.MultiSellIngredient; import org.l2jmobius.gameserver.model.multisell.MultiSellListContainer; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java index a97d4c7d71..77420b22cd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Fisherman; import org.l2jmobius.gameserver.model.actor.instance.Folk; import org.l2jmobius.gameserver.model.actor.instance.VillageMaster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExStorageMaxCount; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 18b30c95b9..2d56a2ee12 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index a2a89d4b79..226cf9c155 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.instance.ClanHallManager; import org.l2jmobius.gameserver.model.actor.instance.Fisherman; import org.l2jmobius.gameserver.model.actor.instance.MercManager; import org.l2jmobius.gameserver.model.actor.instance.Merchant; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java index 245836e09a..84da339bd3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyProcure.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ManorManager; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 29348b9efe..0826abeb46 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.instancemanager.CastleManorManager.SeedProductio import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ManorManager; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java index cf372323d4..c3e9a01bc6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangePetName.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.data.sql.PetNameTable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index afb843ff92..0753aea698 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExConfirmCancelItem; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index 952f2a5eab..376e73b3ab 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExConfirmVariationGemstone; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index 24479150d7..6898ca2e2a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExConfirmVariationRefiner; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index d8eba5049e..a27deb98ef 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExConfirmVariationItem; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 9c6504e21f..6a68664c75 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 0e782aa044..9d49855428 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.sql.PetDataTable; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index e424a29695..fbc14cf944 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 750367a658..04e771d3ae 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -22,9 +22,9 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EnchantResult; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 0e47ae7e6b..598c84af42 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Folk; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 48fd5fc5ff..09e603344e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.IllegalPlayerAction; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index f313a259f2..bccc1ae5c2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 2d5d44b963..a867d9b1e5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.HennaItemInfo; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 947dd691da..70e6c23afb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 7eeb40f443..77f15b2cf8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index d8a1351b7a..2408c6ff89 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.data.xml.BoatData; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index bcce9d72b2..be4084948c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Folk; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index 0747f6a8e3..296ecb1e36 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index df39890020..b1c6096b49 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetInfo; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index ab4479bcf1..d57f65b7f9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.model.ItemRequest; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.TradeList.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index de743e0151..d45b7c5808 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ManorManager; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java index 9ab9d34b10..86a18d56e9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Boat; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.StaticObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; import org.l2jmobius.gameserver.network.serverpackets.DoorInfo; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index daf39f1a1a..17a9cb4b4d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.AugmentationData; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationResult; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 5d39c4ded5..effbbecaca 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 98f2092059..5e65234350 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Fisherman; import org.l2jmobius.gameserver.model.actor.instance.Merchant; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index c33b7b2da8..1091dbce2b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java index 9612908d1c..132e0e5d2f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestWearItem.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.MercManager; import org.l2jmobius.gameserver.model.actor.instance.Merchant; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 2d2442cee0..0e607aa11c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Folk; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 9b364d5199..a99759e0b6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Folk; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 7428b78403..b0f7ddba41 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index 9b83f5a5c1..29bad6b104 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.StoreTradeList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index 80d5c61b1e..6579adce9e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.StoreTradeList; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 95c51c5c98..a508f44167 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java index ba918f7c3a..a6c77b97fe 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 8352b4ac9e..2c74c771dc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ManorSeedData; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java index ce3b2cb689..f1d59034a7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewHennaInfo implements IClientOutgoingPacket diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index fac8992f23..3b00087bfb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 4c997422ac..f87906663a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,9 +21,9 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index a82ae17cf5..717b548b8d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 930df2d253..0319e3a4fa 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; public class HennaEquipList implements IClientOutgoingPacket diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 4cf17377e7..1146173d86 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; public class HennaInfo implements IClientOutgoingPacket diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java index 99126f35f2..ff97978c0d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; public class HennaItemInfo implements IClientOutgoingPacket diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 3ecc98a386..bbfd432bfc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; public class HennaItemRemoveInfo implements IClientOutgoingPacket diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 3598bfa25f..e7a130fff6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; public class HennaRemoveList implements IClientOutgoingPacket diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 5fd5477d08..a1adf426c2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index 739668e559..a7c40fc36a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index 03ef70c9ae..022ace542b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.List; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index b0652e97a8..010728605d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 84598cc24e..2ab73d789c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4e864e250a..c22b960801 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.TradeList.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java index de26e9b9b1..6ff29a30a1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 54467b34a6..8928185ce9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -26,7 +26,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CastleManorManager.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 9d6313507c..213fe06beb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 4983598918..80aa78ab2a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index 215fa9b959..7320188d2d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.TradeList.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index d472026022..9c59febb74 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index a4d905fa78..b6c4f7b18f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java index c311955728..608eb9a006 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.StoreTradeList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WearList implements IClientOutgoingPacket diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index d480732216..b1cbe62f30 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index f135a140cb..d3a59ba46b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -25,8 +25,8 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java index e01bfe27a9..27cad8629b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.Skill.SkillType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Env; import org.l2jmobius.gameserver.model.skills.Stat; import org.l2jmobius.gameserver.model.skills.conditions.Condition; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java index 3650c8f20d..ed98b13558 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -27,13 +27,13 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author mkizub, JIV diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/filter/ItemFilter.java index ce7f360a0f..4e6ae82f63 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,8 +21,8 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; /** * @author Advi diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java index f285544ed6..1e0fa63f44 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java @@ -73,8 +73,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Monster; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 73228338f9..2fce1fe393 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java index edcc620770..f8617370be 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SiegeGuards.java index 07d6a45613..ea67a6b16c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java index 9b9b519eed..10189d5f21 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.VillageMaster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java index 573063d865..8175aea6f0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index d0fe3ac5e2..fb8fb347db 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -49,8 +49,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.clanhalls.ClanHallSiegeEngine; import org.l2jmobius.gameserver.model.siege.clanhalls.SiegableHall; import org.l2jmobius.gameserver.model.siege.clanhalls.SiegeStatus; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/Validators/SubClassSkills.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/Validators/SubClassSkills.java index 633c942e34..ae0dc5d8d4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/Validators/SubClassSkills.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/Validators/SubClassSkills.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Wedding/Wedding.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Wedding/Wedding.java index e7305c8c78..e709d4d119 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Wedding/Wedding.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Wedding/Wedding.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Couple; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 3ae7261e0f..63a11b6569 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionCancel; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index e48d63831f..7153e0bd56 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index bb113c1ab8..9f52f8ca8a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.util.BuilderUtil; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 30cbfc2c2c..e151a8b7e7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.Elementals; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 0a0c7998a4..4ae895c36b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 3d09bdea10..94b0fc92c4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ClanHallManager; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Festival.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Festival.java index e53f9646e8..3fc3cbb256 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Festival.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Festival.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FestivalGuide; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index a1dac8e67f..4a0debf3a8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Loto.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Loto.java index f82a06a8f5..722061e5ba 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Loto.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/Loto.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.games.Lottery; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index f6b52b0ef4..c51448b987 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0bcdf0fc88..e2cef26f29 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; /** * @author yksdtc diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 30779bf270..30d1fcd699 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 03f276a520..d85653fe6e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index d4951b1d3c..4c55c1d1cd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Fishing.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Fishing.java index aa96a9e021..05b6e976b1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Fishing.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Fishing.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 18a49dcc05..4203714dea 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -22,8 +22,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Pumping.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Pumping.java index 32512382d5..3abe4d7ef2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Pumping.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Pumping.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.fishing.Fishing; import org.l2jmobius.gameserver.model.fishing.FishingRod; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Reeling.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Reeling.java index a34b830349..d9b8575a6f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Reeling.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Reeling.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.fishing.Fishing; import org.l2jmobius.gameserver.model.fishing.FishingRod; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6c91400e5c..69a35570ff 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 6d84587ab9..7fa47515a0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 15ba8480c0..cb795db49b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index 6db75d47ac..721244c8d6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java index 2e6b97b512..7c446f7aba 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BeastSpice.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class BeastSpice implements IItemHandler diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 4827f3f769..4c517c880f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 308647c6bc..f2b1aa32d0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Book.java index 81e248fc5a..fe1b76cb70 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 1f9246d222..c82ed32fc8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Disguise.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Disguise.java index 2101f9bc4d..729a60b8b0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Disguise.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Disguise.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 54f156bed6..d5661ab9ba 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index 7853873815..48509dd236 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index 2d9a194638..122793a389 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 8bc1ac87fe..a96921e455 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 9cfbb7bea0..6cfb266d37 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index eeab93c97b..f2a2ca2a45 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 9506a254a0..6271abda8f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 71af008ffe..929a869cbb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index ed1e49a405..2912552d2a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.MercTicketManager; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index 49bd1bc94a..b5da0961b0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index a02ba0a458..416db2db24 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 02629d5d34..e17c4d3c90 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 353d5f8cd5..1fc95c05ca 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Seed.java index 23add08fe2..abd4b14a0f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java index 3229ef2b3d..29ce1eb5ef 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SSQStatus; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 1488eecb4c..2d6fb2d125 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index b87759b05c..067b4582d6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index 6db5e76f6c..f271c29261 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java index 39e723e738..f0ebfaec4d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index baf263a18d..d74c6481dd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceWorld; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java index 1a2fc43b02..ea0369655f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.variables.PlayerVariables; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java index 83497320d6..5f6abc7ba1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java index 2c6fa5c854..9ed90cd3f9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index 1199d0cac5..b56cd84de1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java index e47b433538..f1c0f1c51c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java index 8d748c2e5d..96df9535e4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java index bae3d18e70..ebfc7d19db 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java index 93193b0d32..04135be803 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java index e064b99052..24f72ee7db 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 6ef080e3a7..6e6c061523 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -57,7 +57,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.attackable.OnAtta import org.l2jmobius.gameserver.model.events.impl.creature.npc.attackable.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 79e474de9e..146606d1eb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,9 +47,9 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/AugmentationData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/AugmentationData.java index cacb1b285d..0764602e92 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/AugmentationData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/AugmentationData.java @@ -35,8 +35,8 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.OptionData; import org.l2jmobius.gameserver.model.Augmentation; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.network.clientpackets.AbstractRefinePacket; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/ItemTable.java index d767b17dab..fa9bd7be4e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index 7825092472..13fe1ec9d0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index 96d44d3a59..3296fd7f1e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -37,7 +37,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.BuyListHolder; import org.l2jmobius.gameserver.model.buylist.Product; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 5f637df822..ff91e53163 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 152552607c..548764cc2d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 62f95ac4a3..a3fb32d49e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -29,9 +29,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.StatFunction; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index f488945ae2..0991b63d32 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/HennaData.java index a93cb72a35..01e9977452 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * This class holds the henna related information.
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 2d1bd7aa9f..020817f78d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -30,7 +30,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 87428261e0..0478f9c4a6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 0839fb06ef..46f3ff603f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 7512cb4d28..fde5d0cd87 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 197be97493..af003d2713 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -48,7 +48,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; import org.l2jmobius.gameserver.model.actor.instance.RiftInvader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java index 99b8f7fdec..6790d67fca 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.DimensionalRiftRoom; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index 4ce48d1a1a..b135276a0a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index 14ff4868bf..7fed3a1e61 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -48,7 +48,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.SepulcherMonster; import org.l2jmobius.gameserver.model.actor.instance.SepulcherNpc; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 4c5e8e5061..b0c798fd2a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java index b214af7030..b768f09f86 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 422d432dd4..4b3a1a1c8f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -34,9 +34,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 7b0e66a29a..3bd18d9ba6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 68ff3924ff..212d5ae209 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ac62b1a4aa..6cb80514be 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -36,8 +36,8 @@ import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java index 362bef0c0f..a579be6a5f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/ArmorSet.java index b67f430158..2f339d2183 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Luno diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CombatFlag.java index fa61ee28bd..9e175b32c9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 059cf327ce..866eabea92 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -36,8 +36,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/ItemInfo.java index 7f8092833d..855da7bd43 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -16,8 +16,8 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java index 747e6ac85c..466d232871 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/ShortCuts.java index 5f6d7077fd..6bfabe6f5b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TempItem.java index 26b6de48c9..b1f4ca4081 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TerritoryWard.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TerritoryWard.java index 0e2753dad9..1839b6a1bf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TerritoryWard.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TerritoryWard.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TimeStamp.java index daa4dc21b1..90b62ea0fa 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TradeItem.java index 28ccf8e743..551df43ede 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -16,8 +16,8 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TradeList.java index 34d7a26147..190e36f3f4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java index e6687bcf1b..d5b0ea0c81 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -63,8 +63,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.attackable.OnAtta import org.l2jmobius.gameserver.model.events.impl.creature.npc.attackable.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java index 9ea032057a..adc29e017c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -111,11 +111,11 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java index 0ab4a0603e..909dfdc79a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -73,9 +73,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSpawn; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleport; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java index 4537e46e96..6ae209676e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -212,6 +212,16 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IEventListener; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; @@ -219,16 +229,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.multisell.PreparedListContainer; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java index de456b8fe8..f9c352c591 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index 1f816e66f6..36d82fef77 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -33,8 +33,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java index bd70b9da83..b89c7da24e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 116b47dfbd..496007bc0f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 6186f89731..720d48bf16 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 461e1e6c61..7f2d3baf9a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -42,8 +42,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java index 70a88607d6..5f5656e29a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 97050fc645..be5fb4f1f2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -53,11 +53,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index ac2c475d0e..e834e8676f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java index acd84cb54c..ad498008d3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcFirstTalk; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java index 5e4cf5679a..162e06f83a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 82d8d1d07a..5855a5d110 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 78a35d5fee..1758ae7a37 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index 7159fa0334..eb3cccf2ad 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.trap.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 939c2a2c3a..414ab8b8a7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.Elementals; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.transform.Transform; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Calculator; import org.l2jmobius.gameserver.model.stats.MoveType; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index d2f628c5e8..b579f00a2c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.playable.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SwampZone; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index b483f6f145..52626d9b27 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 0ff8ac6e30..38ef04aba5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 2dcaa90bab..168859ab97 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index ba4493419f..9b67337adf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/buylist/Product.java index cb28381f12..1cea13d7b9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/Condition.java index cc50b04bf1..63a6b5ba3b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 58ac4240b6..b92866a2cc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index 142c8210d4..21bd46e7dc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index af619a4c1d..057ff584d4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index 03c878edf7..23dedb60b2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 05a76eaf6c..00c7ff3eae 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index a2ece31907..9a3206fbeb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 9f651d66f1..536af4629c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 68707cf2e3..063bc0c888 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 613201101d..195aa69b33 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummon.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummon.java index c363401788..d3a5f2dd7b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 3b0f28f35b..0c283ff6fb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 4ed9b1e5ad..d13266556c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index f21525eeed..253ba1ae04 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 2503a92455..3cbce5f03d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 5d31d60dfd..fce99d725f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index d1b7237cbd..a111af4342 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 8009100998..62bd4427f0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index 1ba993f614..cbd6ef558e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index bab8b12ab1..9f4fdbdfc9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index f075e24bf1..3099ac1a16 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 05bbdc56b9..6b1f35d14c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -20,8 +20,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index 70a31e8e67..71676604da 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.InstanceWorld; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 0d5d7b69f0..28ed7bf906 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index 8990ef963f..8982e31fe3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index d53886a24f..720558a8cf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index b211481b68..11fc5b8647 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index faac07c717..06c6016138 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 0488a20fff..b94ce27a49 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index 4a6cef2474..b2b8f16f18 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 0523ecf9da..f609cb3664 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9583b2e799..ce35709019 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index d344dc0823..178e941a5a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 3ff78dcc32..d4b77454d0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index e77d1ceb3e..36ec8609e3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 66c78f6369..5cbde8500a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index 2d9aa5ff12..380c6c7271 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 6f4f7368eb..54d22cc9e4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index e361afa1c4..967f4c04a3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormal.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormal.java index 743b2397f2..053aadd241 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormal.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index 03a334331f..954045bc00 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 44f6865049..60de554e4b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 6a72a2f9ad..3db6f309b5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 7ecafb95f0..24b30224c1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index 3a83bf7740..b0715da225 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index d882933f0f..7190fca370 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index b17407835c..bb2742ca92 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index 16c28890da..da73de8593 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 7c5304ee95..bf5cbb95b9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index 504acc6540..e1f7569ed5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index e9728627a6..6a749cefad 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index 305515ac38..63ccb17890 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index e36b80772f..db9ac31505 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -109,14 +109,14 @@ import org.l2jmobius.gameserver.model.holders.MovieHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.InstanceWorld; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index c85a2c84d9..8447a7f456 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Augmentation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemAdd.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemAdd.java index 4ed6f933f7..4b6314a269 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player.clanwh; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemDestroy.java index c39d057b30..9693533dea 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player.clanwh; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemTransfer.java index 4f02e43879..2deaccaa2e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player.clanwh; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemAdd.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemAdd.java index f4d5b9c355..35e7f5c91c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemAdd.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player.inventory; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDestroy.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDestroy.java index 387c8de7ec..31a6938029 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDestroy.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player.inventory; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDrop.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDrop.java index 0cf5d63fd5..9bd2b652db 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDrop.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemPickup.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemPickup.java index d071575faa..7d012e7779 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemPickup.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player.inventory; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemTransfer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemTransfer.java index 5b2e975ddc..8f4db84e78 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemTransfer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player.inventory; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/PrimeShopProductHolder.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/PrimeShopProductHolder.java index ce6e3dc5e3..65383cf8ee 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/PrimeShopProductHolder.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/PrimeShopProductHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 93% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/Armor.java index 5452cff083..e1289e8eae 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/EtcItem.java similarity index 93% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/EtcItem.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/EtcItem.java index 2df7653be8..61bdff8c56 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; /** * This class is dedicated to the management of EtcItem. diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/Henna.java similarity index 94% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Henna.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/Henna.java index 72bd1dfe8f..65a4b9fb37 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.List; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index f5038ca8c2..edf16c52b8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -34,12 +34,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.functions.AbstractFunction; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 90% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index 25d61fbfea..ffe096ce80 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/Weapon.java similarity index 95% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Weapon.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/Weapon.java index bb0219e1d6..4748a7649f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java similarity index 88% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 2c00e30d69..ce1fbaba85 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java similarity index 94% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java index 6324f29ec4..c3f6f86311 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.ArrayList; import java.util.List; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..6b234768e4 --- /dev/null +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private int _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(int slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 92% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index 01be586f0e..5832466f22 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java similarity index 90% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java index 2d1fab86a7..93aa2c66e2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java similarity index 87% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java index e0314ae7f0..0a72767ced 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 16bef02b2c..5fa5960721 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -59,12 +59,12 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPl import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent; import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/ActionType.java similarity index 91% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/ActionType.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/ActionType.java index 63c61d6693..37d27dcb4d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Action Type enumerated. diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java similarity index 93% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java index 3f01a01f0d..c9f9cd9567 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Crystal Type enumerated. diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 92% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index 290b82b771..75fd43394d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * EtcItem Type enumerated. diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java similarity index 93% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename to L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java index 08d7c3c09a..605738c0a7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 1528d8dde0..746e8641da 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.Augmentation; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 5d4bbe339b..bb4ba566b2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 0c3797fc9c..bd9c9c5b5d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3321414dcf..e2dc77482e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.clanwh.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.clanwh.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.clanwh.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 1b1713e490..28779a1c58 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -40,10 +40,10 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 848bfb95f5..835d5a6a9b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 961e6435cf..be5f926b2b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 6ed021928f..ef7d332826 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 2c3b055b13..417f44ab88 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPl import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 97c7d2a598..5abb02d85c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fb23338d90..0000000000 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private int _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(int slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java index 5fa4035cd0..c41c6e2ef8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java @@ -18,10 +18,10 @@ package org.l2jmobius.gameserver.model.multisell; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/ItemInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/ItemInfo.java index bcda5617f0..844f470c2b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/ItemInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/ItemInfo.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.multisell; import org.l2jmobius.gameserver.model.Elementals; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/PreparedEntry.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/PreparedEntry.java index 2614b09b46..7ff77497c2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/PreparedEntry.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/PreparedEntry.java @@ -20,7 +20,7 @@ import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import java.util.ArrayList; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/PreparedListContainer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/PreparedListContainer.java index e35400f17b..4c26cf6e67 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/PreparedListContainer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/PreparedListContainer.java @@ -22,7 +22,7 @@ import java.util.LinkedList; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PreparedListContainer extends ListContainer { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index d152e6c454..216c951efc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -46,8 +46,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBrExtraUserInfo; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index 8d8a8daa58..3b4ccc4ac1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.olympiad.OnOlympiadMatchResult; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/options/Options.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/options/Options.java index 765c912565..45781b2a30 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/options/Options.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/options/Options.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.functions.AbstractFunction; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java index a7d4edff1c..e7ff232bed 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -56,8 +56,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.listeners.AbstractEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java index 00100f0f58..9f61928660 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FestivalMonster; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java index ef3a3ca700..665c4d3053 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -37,11 +37,11 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.actor.instance.StaticObject; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java index f6d18c7a74..7b292d8174 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.model.stats.functions; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchantHp.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchantHp.java index 45b507a7a0..789f9e8260 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchantHp.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchantHp.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.functions; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncTemplate.java index 53bbc9b764..03427b11eb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/FuncTemplate.java @@ -22,7 +22,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.enums.StatFunction; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java index 3acb1c230f..0a1ba4508b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.AbstractFunction; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncPDefMod.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncPDefMod.java index 63f5cedd04..135f5d2981 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncPDefMod.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncPDefMod.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.model.stats.functions.formulas; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.AbstractFunction; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 55a477ba44..12094227f6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,11 +24,11 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.SystemMessageId; public abstract class AbstractRefinePacket implements IClientIncomingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 9b852a83f4..132d577a07 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -40,8 +40,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 731b56e6b7..7d0a86fd6f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -55,7 +55,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ClassMaster; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 9d50a15ba1..816f9085e6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.Augmentation; import org.l2jmobius.gameserver.model.Elementals; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.multisell.Entry; import org.l2jmobius.gameserver.model.multisell.Ingredient; import org.l2jmobius.gameserver.model.multisell.PreparedListContainer; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index fb33167821..ab748e5258 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSkillLearn; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 424de3b327..506e82e983 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java index 9e1fd77494..437880c790 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PrimeShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExBrBuyProduct; import org.l2jmobius.gameserver.network.serverpackets.ExBrGamePoint; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index ae1fa8e448..6a209cb5e6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 0a61a15cd0..70051935e0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.network.Disconnection; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 3b1a31cdf1..16ab19e954 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index e69ad71d68..d7e7f94d47 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index 4aee951015..7cd80adde7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index 2e49ef7182..01c30c609f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutCommissionResultForVariationMake; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index a6e02b36c5..4cc5837d6e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutIntensiveResultForVariationMake; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 706d3d6637..5e0ca812e6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 8b1e9f7701..13190042ec 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 749b963b94..5597f7200e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 62e1572322..a576b7151e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,10 +23,10 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 2a6e863402..d5747daa79 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index b65e39db1d..8f86baceec 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.Elementals; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 61ca7973b9..73fd924407 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.EnchantSkillLearn; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java index 3a895239c5..a3fa816961 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.EnchantSkillLearn; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java index ced6acd772..637257538b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.EnchantSkillLearn; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java index 790e2dbf02..98bf8b0cce 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.EnchantSkillLearn; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index f8b5c224d0..c5b912a720 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Elementals; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExShowBaseAttributeCancelWindow; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 7d5081b28a..f87b4e3539 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 37b21d2fb0..2d110363b9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index c6e45c5590..02f1633c90 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index d7ec1cf7ce..20db5022d4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index d35a38fd23..c7f51c1de5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index fede5203a1..6ff69e5355 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 4643758663..60854d1a90 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index f0dca394bb..44b26abac9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index b531c9155b..aaf2cb1de3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index a921aebc88..5c9f93f74d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java index e8976855c3..787b343137 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PackageSendableList; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index e750c5bda8..1fca5b87d6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.MercTicketManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 670ae9a90e..61715121bc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 6860d4c2f2..1db252cc96 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 1374534dc1..df9f52bac1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -30,12 +30,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.BuyListHolder; import org.l2jmobius.gameserver.model.buylist.Product; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 6ddb2e79f5..019082a41d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 8b28aa5b76..c46ab1da71 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.AugmentationData; import org.l2jmobius.gameserver.model.Augmentation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationResult; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index da397ce886..9429c64055 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index f22a2cff51..e2e682cbd7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.BuyListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 53140f8c4a..393a9ca55c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.BuyListHolder; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 46028e9321..26f568f261 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index be98dcdb6c..85447061cc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index b3033619f2..352d88f71a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 08f9112160..249e5d95a7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 333210606f..b1af21fc5c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 59708fe7f6..1448af6612 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -34,13 +34,13 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51f689b277..8b40712b46 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 0b658b702d..b429a53f7b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index da409d80a8..a2db08f8df 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.BuyListHolder; import org.l2jmobius.gameserver.model.buylist.Product; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class BuyList implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 61e0c0fcf3..0fece14daf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java index 5081ea56d5..31773fbaa0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EquipUpdate implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index cde174def5..d80712a0a5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.buylist.BuyListHolder; import org.l2jmobius.gameserver.model.buylist.Product; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index 28767bfcca..16294db9e4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index ded53ee9ca..671ad3c5af 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 33f3dcfddd..4f66777243 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 95a336021c..c40c8c925a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 5936c54ba8..ba20402c72 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index bef0bbe84f..05674e6993 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index bd7cbe7252..1b853a98bb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 7dbb844c2c..b7731eb11a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index 89ed137d58..9021e2f780 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index b690bd9455..c14caa76e0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index bb318c3551..5b4ee64167 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 312fd10338..9ab9f0a836 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 6840fd8e5e..484a17d676 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index f68e6556d3..ee3c55cd4b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 3ef23841f3..1a69e823fe 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 8d7a0d58d7..1b4cfefc1e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 4d301dcf7b..3378827f34 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index 07ccc42df3..983df1469c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index 9257f9f8a0..84e6084c8e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index b50b9f68dd..95619daabd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index ee8056554f..26e8e29e91 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 086dc5a78a..fc53ece03c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 1c2e02446a..9fcd06bdff 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index e64ccefb4b..1b3708b964 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.BuyListHolder; import org.l2jmobius.gameserver.model.buylist.Product; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java index 30630c1523..2f1c3d678d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java @@ -26,12 +26,12 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index ca4a4ee04c..c2fedd99c0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 60f40849d1..5c8d8dc145 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 38565f7af4..c74e7b494a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 113ece4737..770813c5a8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 4f5a4bd924..3212decd51 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentBase.java index c10d8a61fd..d7c53b09c3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -123,9 +123,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentItem.java index 30f838683c..a43d3c747c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -28,7 +28,7 @@ import org.w3c.dom.Node; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author mkizub, JIV @@ -179,7 +179,7 @@ public class DocumentItem extends DocumentBase try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Evolve.java index b784c84664..5c688249e5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/filter/ItemFilter.java index 1d02799b2d..887909c2c0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 73228338f9..2fce1fe393 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java index edcc620770..f8617370be 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/AvantGarde/AvantGarde.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SiegeGuards.java index 07d6a45613..ea67a6b16c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java index 9b9b519eed..10189d5f21 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.VillageMaster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java index 573063d865..8175aea6f0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TerritoryManagers/TerritoryManagers.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index d0fe3ac5e2..fb8fb347db 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -49,8 +49,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.clanhalls.ClanHallSiegeEngine; import org.l2jmobius.gameserver.model.siege.clanhalls.SiegableHall; import org.l2jmobius.gameserver.model.siege.clanhalls.SiegeStatus; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java index 633c942e34..ae0dc5d8d4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.data.xml.ClassListData; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java index e7305c8c78..e709d4d119 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Wedding/Wedding.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Couple; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index 3ae7261e0f..63a11b6569 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionCancel; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index e48d63831f..7153e0bd56 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index bb113c1ab8..9f52f8ca8a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.util.BuilderUtil; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 30cbfc2c2c..e151a8b7e7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,8 +20,8 @@ import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.Elementals; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 0a0c7998a4..4ae895c36b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 3d09bdea10..94b0fc92c4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ClanHallManager; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java index e53f9646e8..3fc3cbb256 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Festival.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FestivalGuide; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index a1dac8e67f..4a0debf3a8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java index f82a06a8f5..722061e5ba 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.games.Lottery; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 7fdfba45d6..c8233d9ee1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0bcdf0fc88..e2cef26f29 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; /** * @author yksdtc diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 30779bf270..30d1fcd699 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 03f276a520..d85653fe6e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index d4951b1d3c..4c55c1d1cd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java index aa96a9e021..05b6e976b1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Fishing.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 18a49dcc05..4203714dea 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -22,8 +22,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Pumping.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Pumping.java index 32512382d5..3abe4d7ef2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Pumping.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Pumping.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.fishing.Fishing; import org.l2jmobius.gameserver.model.fishing.FishingRod; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Reeling.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Reeling.java index a34b830349..d9b8575a6f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Reeling.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Reeling.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.fishing.Fishing; import org.l2jmobius.gameserver.model.fishing.FishingRod; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6c91400e5c..69a35570ff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 6d84587ab9..7fa47515a0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 15ba8480c0..cb795db49b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index 8865d949ab..b85333a15d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 2b3c6727bd..ec479c9b04 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 308647c6bc..f2b1aa32d0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Book.java index 81e248fc5a..fe1b76cb70 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 1f9246d222..c82ed32fc8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Disguise.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Disguise.java index 2101f9bc4d..729a60b8b0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Disguise.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Disguise.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 54f156bed6..d5661ab9ba 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index 7853873815..48509dd236 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index 2d9a194638..122793a389 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 8bc1ac87fe..a96921e455 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 9cfbb7bea0..6cfb266d37 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index eeab93c97b..f2a2ca2a45 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 9506a254a0..6271abda8f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 71af008ffe..929a869cbb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index ed1e49a405..2912552d2a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.MercTicketManager; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index 49bd1bc94a..b5da0961b0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index a02ba0a458..416db2db24 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 02629d5d34..e17c4d3c90 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 353d5f8cd5..1fc95c05ca 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Seed.java index 23add08fe2..abd4b14a0f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java index 3229ef2b3d..29ce1eb5ef 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SevenSignsRecord.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SSQStatus; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 1488eecb4c..2d6fb2d125 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index b87759b05c..067b4582d6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index 6db5e76f6c..f271c29261 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java index 39e723e738..f0ebfaec4d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/TeleportBookmark.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index baf263a18d..d74c6481dd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceWorld; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java index 1a2fc43b02..ea0369655f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.variables.PlayerVariables; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java index 83497320d6..5f6abc7ba1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java index 2c6fa5c854..9ed90cd3f9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index 1199d0cac5..b56cd84de1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java index e47b433538..f1c0f1c51c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java index 8d748c2e5d..96df9535e4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java index bae3d18e70..ebfc7d19db 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java index 93193b0d32..04135be803 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java index e064b99052..24f72ee7db 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 35818bb895..b1cd5b90b4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.CommandChannel; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java index 5d437ec57d..65109ffac9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java @@ -22,7 +22,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.QuestType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 6ef080e3a7..6e6c061523 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -57,7 +57,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.attackable.OnAtta import org.l2jmobius.gameserver.model.events.impl.creature.npc.attackable.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 79e474de9e..146606d1eb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,9 +47,9 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/AugmentationData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/AugmentationData.java index cacb1b285d..0764602e92 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/AugmentationData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/AugmentationData.java @@ -35,8 +35,8 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.OptionData; import org.l2jmobius.gameserver.model.Augmentation; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.network.clientpackets.AbstractRefinePacket; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/ItemTable.java index d767b17dab..fa9bd7be4e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index 7825092472..13fe1ec9d0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index 96d44d3a59..3296fd7f1e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -37,7 +37,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.BuyListHolder; import org.l2jmobius.gameserver.model.buylist.Product; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 5f637df822..ff91e53163 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 152552607c..548764cc2d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 62f95ac4a3..a3fb32d49e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -29,9 +29,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.StatFunction; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index f488945ae2..0991b63d32 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/HennaData.java index a93cb72a35..01e9977452 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * This class holds the henna related information.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 2d1bd7aa9f..020817f78d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -30,7 +30,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 87428261e0..0478f9c4a6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 0839fb06ef..46f3ff603f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 7512cb4d28..fde5d0cd87 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 197be97493..af003d2713 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -48,7 +48,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; import org.l2jmobius.gameserver.model.actor.instance.RiftInvader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java index 99b8f7fdec..6790d67fca 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java @@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.DimensionalRiftRoom; import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index 4ce48d1a1a..b135276a0a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index 14ff4868bf..7fed3a1e61 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -48,7 +48,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.actor.instance.SepulcherMonster; import org.l2jmobius.gameserver.model.actor.instance.SepulcherNpc; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 4c5e8e5061..b0c798fd2a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java index b214af7030..b768f09f86 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 422d432dd4..4b3a1a1c8f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -34,9 +34,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 4b5e2040a9..ae0276f74f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 68ff3924ff..212d5ae209 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ac62b1a4aa..6cb80514be 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -36,8 +36,8 @@ import org.l2jmobius.gameserver.model.Spawn; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java index 362bef0c0f..a579be6a5f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/ArmorSet.java index b67f430158..2f339d2183 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Luno diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CombatFlag.java index fa61ee28bd..9e175b32c9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 059cf327ce..866eabea92 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -36,8 +36,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/ItemInfo.java index 7f8092833d..855da7bd43 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -16,8 +16,8 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java index 3cbd14923f..d3fc8393c1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/ShortCuts.java index 5f6d7077fd..6bfabe6f5b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TempItem.java index 26b6de48c9..b1f4ca4081 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TerritoryWard.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TerritoryWard.java index 0e2753dad9..1839b6a1bf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TerritoryWard.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TerritoryWard.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TimeStamp.java index daa4dc21b1..90b62ea0fa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TradeItem.java index 28ccf8e743..551df43ede 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -16,8 +16,8 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TradeList.java index 34d7a26147..190e36f3f4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java index e6687bcf1b..d5b0ea0c81 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -63,8 +63,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.attackable.OnAtta import org.l2jmobius.gameserver.model.events.impl.creature.npc.attackable.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java index da5e8b5a6b..d17dab2c76 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -111,11 +111,11 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java index 0ab4a0603e..909dfdc79a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -73,9 +73,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSpawn; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleport; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java index cab8c5a019..33d042505c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -215,6 +215,16 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IEventListener; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; @@ -222,16 +232,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.multisell.PreparedListContainer; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java index 86e336a8e3..4327951324 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index 1f816e66f6..36d82fef77 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -33,8 +33,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java index bd70b9da83..b89c7da24e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/BabyPet.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index 116b47dfbd..496007bc0f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 6186f89731..720d48bf16 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 461e1e6c61..7f2d3baf9a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -42,8 +42,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java index 70a88607d6..5f5656e29a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FestivalMonster.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 97050fc645..be5fb4f1f2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -53,11 +53,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index ac2c475d0e..e834e8676f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java index acd84cb54c..ad498008d3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpc.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcFirstTalk; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java index 5e4cf5679a..162e06f83a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriest.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 82d8d1d07a..5855a5d110 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 78a35d5fee..1758ae7a37 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index 42a004970e..9318db7064 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.trap.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index 939c2a2c3a..414ab8b8a7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.Elementals; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.transform.Transform; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Calculator; import org.l2jmobius.gameserver.model.stats.MoveType; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index d2f628c5e8..b579f00a2c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.playable.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.type.SwampZone; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index b483f6f145..52626d9b27 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 0ff8ac6e30..38ef04aba5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 2dcaa90bab..168859ab97 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index ba4493419f..9b67337adf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/buylist/Product.java index cb28381f12..1cea13d7b9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/Condition.java index cc50b04bf1..63a6b5ba3b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 58ac4240b6..b92866a2cc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index 142c8210d4..21bd46e7dc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index af619a4c1d..057ff584d4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index 03c878edf7..23dedb60b2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 05a76eaf6c..00c7ff3eae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index a2ece31907..9a3206fbeb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 9f651d66f1..536af4629c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 68707cf2e3..063bc0c888 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 613201101d..195aa69b33 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummon.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummon.java index c363401788..d3a5f2dd7b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 3b0f28f35b..0c283ff6fb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 4ed9b1e5ad..d13266556c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index f21525eeed..253ba1ae04 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 2503a92455..3cbce5f03d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 5d31d60dfd..fce99d725f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index d1b7237cbd..a111af4342 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 8009100998..62bd4427f0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index 1ba993f614..cbd6ef558e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index bab8b12ab1..9f4fdbdfc9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index f075e24bf1..3099ac1a16 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 05bbdc56b9..6b1f35d14c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -20,8 +20,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index 70a31e8e67..71676604da 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.instancezone.InstanceWorld; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 0d5d7b69f0..28ed7bf906 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index 8990ef963f..8982e31fe3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index d53886a24f..720558a8cf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index b211481b68..11fc5b8647 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index faac07c717..06c6016138 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 0488a20fff..b94ce27a49 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index 4a6cef2474..b2b8f16f18 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 0523ecf9da..f609cb3664 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9583b2e799..ce35709019 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index d344dc0823..178e941a5a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 3ff78dcc32..d4b77454d0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index e77d1ceb3e..36ec8609e3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 66c78f6369..5cbde8500a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index 2d9aa5ff12..380c6c7271 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 6f4f7368eb..54d22cc9e4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index e361afa1c4..967f4c04a3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormal.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormal.java index 743b2397f2..053aadd241 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormal.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index 03a334331f..954045bc00 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 44f6865049..60de554e4b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 6a72a2f9ad..3db6f309b5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 7ecafb95f0..24b30224c1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index 3a83bf7740..b0715da225 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index d882933f0f..7190fca370 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index b17407835c..bb2742ca92 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index 16c28890da..da73de8593 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 7c5304ee95..bf5cbb95b9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index 504acc6540..e1f7569ed5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index e9728627a6..6a749cefad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index 305515ac38..63ccb17890 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index e36b80772f..db9ac31505 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -109,14 +109,14 @@ import org.l2jmobius.gameserver.model.holders.MovieHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.InstanceWorld; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index c85a2c84d9..8447a7f456 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Augmentation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemAdd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemAdd.java index 4ed6f933f7..4b6314a269 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player.clanwh; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemDestroy.java index c39d057b30..9693533dea 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player.clanwh; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemTransfer.java index 4f02e43879..2deaccaa2e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/clanwh/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player.clanwh; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemAdd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemAdd.java index f4d5b9c355..35e7f5c91c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemAdd.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player.inventory; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDestroy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDestroy.java index 387c8de7ec..31a6938029 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDestroy.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player.inventory; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDrop.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDrop.java index 0cf5d63fd5..9bd2b652db 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDrop.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemPickup.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemPickup.java index d071575faa..7d012e7779 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemPickup.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player.inventory; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemTransfer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemTransfer.java index 5b2e975ddc..8f4db84e78 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemTransfer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/creature/player/inventory/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player.inventory; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/PrimeShopProductHolder.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/PrimeShopProductHolder.java index ce6e3dc5e3..65383cf8ee 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/PrimeShopProductHolder.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/PrimeShopProductHolder.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 93% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/Armor.java index 5452cff083..e1289e8eae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/EtcItem.java similarity index 93% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/EtcItem.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/EtcItem.java index 2df7653be8..61bdff8c56 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; /** * This class is dedicated to the management of EtcItem. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/Henna.java similarity index 94% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Henna.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/Henna.java index 72bd1dfe8f..65a4b9fb37 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.List; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index da9bc64d1e..66a83ca5f2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -34,12 +34,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.functions.AbstractFunction; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 90% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index 25d61fbfea..ffe096ce80 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/Weapon.java similarity index 95% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Weapon.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/Weapon.java index bb0219e1d6..4748a7649f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java similarity index 88% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 2c00e30d69..ce1fbaba85 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java similarity index 94% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java index 6324f29ec4..c3f6f86311 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.ArrayList; import java.util.List; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..6b234768e4 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private int _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(int slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 92% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index 01be586f0e..5832466f22 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java similarity index 90% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java index 2d1fab86a7..93aa2c66e2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java similarity index 87% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java index e0314ae7f0..0a72767ced 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 16bef02b2c..5fa5960721 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -59,12 +59,12 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPl import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent; import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.quest.QuestState; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/ActionType.java similarity index 91% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/ActionType.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/ActionType.java index 63c61d6693..37d27dcb4d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Action Type enumerated. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java similarity index 93% rename from L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java index 3f01a01f0d..c9f9cd9567 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Crystal Type enumerated. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 92% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index 290b82b771..75fd43394d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * EtcItem Type enumerated. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java similarity index 93% rename from L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename to L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java index 08d7c3c09a..605738c0a7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 1528d8dde0..746e8641da 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.itemauction; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.Augmentation; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 5d4bbe339b..bb4ba566b2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 0c3797fc9c..bd9c9c5b5d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3321414dcf..e2dc77482e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.clanwh.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.clanwh.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.clanwh.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 1b1713e490..28779a1c58 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -40,10 +40,10 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 848bfb95f5..835d5a6a9b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 961e6435cf..be5f926b2b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 6ed021928f..ef7d332826 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 2c3b055b13..417f44ab88 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPl import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.inventory.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.ItemList; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 97c7d2a598..5abb02d85c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fb23338d90..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private int _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(int slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java index 5fa4035cd0..c41c6e2ef8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/Ingredient.java @@ -18,10 +18,10 @@ package org.l2jmobius.gameserver.model.multisell; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/ItemInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/ItemInfo.java index bcda5617f0..844f470c2b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/ItemInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/ItemInfo.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.multisell; import org.l2jmobius.gameserver.model.Elementals; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/PreparedEntry.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/PreparedEntry.java index 2614b09b46..7ff77497c2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/PreparedEntry.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/PreparedEntry.java @@ -20,7 +20,7 @@ import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import java.util.ArrayList; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/PreparedListContainer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/PreparedListContainer.java index e35400f17b..4c26cf6e67 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/PreparedListContainer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/multisell/PreparedListContainer.java @@ -22,7 +22,7 @@ import java.util.LinkedList; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PreparedListContainer extends ListContainer { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c388df4175..86e1af47d7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.Party.MessageType; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.type.OlympiadStadiumZone; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index e279f8d0a5..4348731835 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -46,8 +46,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBrExtraUserInfo; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/options/Options.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/options/Options.java index 765c912565..45781b2a30 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/options/Options.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/options/Options.java @@ -23,7 +23,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.functions.AbstractFunction; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java index e67e99b22c..9cfdfeaaa2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -56,8 +56,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.listeners.AbstractEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.CompetitionType; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java index 00100f0f58..9f61928660 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/sevensigns/SevenSignsFestival.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.FestivalMonster; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Formulas.java index aa382f0abe..d957ddce08 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -37,11 +37,11 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.actor.instance.StaticObject; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.residences.ClanHall; import org.l2jmobius.gameserver.model.sevensigns.SevenSigns; import org.l2jmobius.gameserver.model.sevensigns.SevenSignsFestival; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java index f6d18c7a74..7b292d8174 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.model.stats.functions; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchantHp.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchantHp.java index 45b507a7a0..789f9e8260 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchantHp.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchantHp.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.functions; import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncTemplate.java index 53bbc9b764..03427b11eb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncTemplate.java @@ -22,7 +22,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.enums.StatFunction; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java index 3acb1c230f..0a1ba4508b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.AbstractFunction; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncPDefMod.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncPDefMod.java index 63f5cedd04..135f5d2981 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncPDefMod.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncPDefMod.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.model.stats.functions.formulas; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.AbstractFunction; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 55a477ba44..12094227f6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,11 +24,11 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.SystemMessageId; public abstract class AbstractRefinePacket implements IClientIncomingPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 9b852a83f4..132d577a07 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -40,8 +40,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 247afa9355..67a33b87d7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ClassMaster; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 9d50a15ba1..816f9085e6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.Augmentation; import org.l2jmobius.gameserver.model.Elementals; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.multisell.Entry; import org.l2jmobius.gameserver.model.multisell.Ingredient; import org.l2jmobius.gameserver.model.multisell.PreparedListContainer; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index fb33167821..ab748e5258 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSkillLearn; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 424de3b327..506e82e983 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java index 9e1fd77494..437880c790 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBrBuyProduct.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.data.xml.PrimeShopData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PrimeShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExBrBuyProduct; import org.l2jmobius.gameserver.network.serverpackets.ExBrGamePoint; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index ae1fa8e448..6a209cb5e6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index fc1537be0b..494f97d5e7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 3b1a31cdf1..16ab19e954 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index e69ad71d68..d7e7f94d47 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index 4aee951015..7cd80adde7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index 2e49ef7182..01c30c609f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutCommissionResultForVariationMake; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index a6e02b36c5..4cc5837d6e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutIntensiveResultForVariationMake; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 706d3d6637..5e0ca812e6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 8b1e9f7701..13190042ec 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 749b963b94..5597f7200e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 62e1572322..a576b7151e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,10 +23,10 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 2a6e863402..d5747daa79 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 1f66003072..a18fd0f88e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.Elementals; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 61ca7973b9..73fd924407 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.EnchantSkillLearn; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java index 3a895239c5..a3fa816961 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.EnchantSkillLearn; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java index ced6acd772..637257538b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.EnchantSkillLearn; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java index 790e2dbf02..98bf8b0cce 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantSkillGroupsData; import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.EnchantSkillLearn; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 17478c2e48..31f7732e43 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Elementals; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 7d5081b28a..f87b4e3539 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index 37b21d2fb0..2d110363b9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index c6e45c5590..02f1633c90 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index d7ec1cf7ce..20db5022d4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index d35a38fd23..c7f51c1de5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index fede5203a1..6ff69e5355 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 4643758663..60854d1a90 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index f0dca394bb..44b26abac9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index b531c9155b..aaf2cb1de3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index a921aebc88..5c9f93f74d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java index e8976855c3..787b343137 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSendableItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PackageSendableList; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index 48cb89c62d..3d8bc6386c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.MercTicketManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 670ae9a90e..61715121bc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 6860d4c2f2..1db252cc96 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 1374534dc1..df9f52bac1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -30,12 +30,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.BuyListHolder; import org.l2jmobius.gameserver.model.buylist.Product; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 6ddb2e79f5..019082a41d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 8b28aa5b76..c46ab1da71 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.AugmentationData; import org.l2jmobius.gameserver.model.Augmentation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationResult; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index da397ce886..9429c64055 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 3fa0e75c1f..219ebf1ce2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.BuyListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 5d725955f5..041320aa09 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.BuyListHolder; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 46028e9321..26f568f261 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index be98dcdb6c..85447061cc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index b3033619f2..352d88f71a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 08f9112160..249e5d95a7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 333210606f..b1af21fc5c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 59708fe7f6..1448af6612 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -34,13 +34,13 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51f689b277..8b40712b46 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index ef8e560f05..271b496ea9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 61e0c0fcf3..0fece14daf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java index 5081ea56d5..31773fbaa0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EquipUpdate implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index f0bf4661f5..534f14ac95 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index 95d294ed9c..c442d9741b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Elementals; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index ded53ee9ca..671ad3c5af 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index d55b5618f5..c4d27d1728 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index e58f511ee7..953ae56e86 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 2c1ac2b5cc..71463c91a1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 68aedb79b2..a7b9a38b52 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index eb09c76ba8..f1b33489ed 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index bd7cbe7252..1b853a98bb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 7dbb844c2c..b7731eb11a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index 89ed137d58..9021e2f780 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index b690bd9455..c14caa76e0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index bb318c3551..5b4ee64167 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 312fd10338..9ab9f0a836 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 6840fd8e5e..484a17d676 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index f68e6556d3..ee3c55cd4b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 3ef23841f3..1a69e823fe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 8d7a0d58d7..1b4cfefc1e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 4d301dcf7b..3378827f34 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index a0c8f129f8..71d4ae1a14 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index 9257f9f8a0..84e6084c8e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index f055fe6bdb..1f60ec39d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 776dec6255..3c20c5f0f1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index a13ff680a3..e8b3f37f62 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 1c2e02446a..9fcd06bdff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index e64ccefb4b..1b3708b964 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.BuyListHolder; import org.l2jmobius.gameserver.model.buylist.Product; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java index 6eddf74013..1515ad1464 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java @@ -26,12 +26,12 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.RecipeData; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index f922b8cb3b..50572fb2c0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 4bdcfc522a..eb2401360b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 3da901fd65..ba83e5de0f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 051e493312..16e9b823de 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index c36a86339c..8b6e77c083 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentBase.java index c10d8a61fd..d7c53b09c3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -123,9 +123,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentItem.java index 30f838683c..a43d3c747c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -28,7 +28,7 @@ import org.w3c.dom.Node; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author mkizub, JIV @@ -179,7 +179,7 @@ public class DocumentItem extends DocumentBase try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Evolve.java index b784c84664..5c688249e5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/filter/ItemFilter.java index 1d02799b2d..887909c2c0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SiegeGuards.java index 8ac4fe72af..c9ca7df743 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index 76f46b0ec0..b1ac4ae517 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index 86db2c351e..5ed5cbd3df 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 9a1bfbc322..4afd6e9f3c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 1ff3d6ae84..ee5c5e5649 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index a1dac8e67f..4a0debf3a8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 6a67c2d642..2e5b2846bf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index dd5c2f593d..2ea2bf9f11 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 4e5a8d7aaf..1950403a0d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d5d2ad10cf..8f4db5d580 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 24d5d75b7a..704f15e5ba 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index a403724d9a..10d1c9e03b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2b6db19588..607dc3b8f5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 4fdcb5ca9a..a4f5e2fc18 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index c6430fd345..8eaf69885f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index 1866a34d94..b7c74b3b74 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 7f55fdc9ed..7e0edf65b8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 28b0f453fc..5c2f25e7f2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 2ed9c1c346..7f5e0e87a1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index ebbd33bda0..f952b58fa2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 189a2f7e73..714a195ccb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 7d2f4894c6..770b66ee92 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 02468039cf..742f98e38b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 742ca00283..3d97c9ac22 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 3eb4d77710..8b4d315b50 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index a88c6c50c5..0aa5cb3e1f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6f313482ab..54230f39a1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b4ea6e761f..bfc5324c4d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 410e71cff8..01714d7f5a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VipUp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VipUp.java index 9cf1267bbb..f716953da2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VipUp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VipUp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index ecb73b365e..30e5fd51af 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 80351144d6..44599b2555 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 2472a2d955..85d614b478 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index d1d5c8c332..c2610ec4e3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 423bed4846..229c78bbfd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 8955d1ded8..4038667359 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 08b6a89862..be188604d3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 02629d5d34..e17c4d3c90 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27f0904f0f..a61cc1bd71 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 255f805e72..12f575b243 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index 3988e77104..587f809dc9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 0ff861388c..75ab0bae7e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java index 4e5984b292..efde71ba49 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java index e70725593d..954c6b4142 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java index a3a6734f90..13e468df91 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.QuestSoundHtmlHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java index d29aaf54b5..7773083c9a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java index cb732dea8c..bd13a4bbe9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java index 00920614ce..0d21264633 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java index bb78cafa1c..670e0a7192 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/ItemTable.java index 9197c33197..914259543f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index 8188d90cc5..3bfdfb138c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 99e8b8b3d2..1c3099e6c4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index d134fe859e..c57e62c683 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index e131a0f0e5..3359c09da3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 07af46b4a4..339a7e047c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index d2337f0f98..df1c988200 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 0f7be781b2..7bc7be8487 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index ba3ab89b07..20d23bc7fc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 85c1538ea4..3e02ce19ab 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -35,9 +35,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 3d21c7ddf0..5f3eb28e8a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ArmorSet.java index 4d11cf0970..a84709e2db 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CombatFlag.java index dc49fce1cc..7385a9fc13 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CursedWeapon.java index f34fda05ad..806375ccc4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java index ec67ca4a4a..5244307c22 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java @@ -45,8 +45,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java index a9796fbbb7..36f3461010 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TradeList.java index ff44805912..299c136cf4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 5012c48eca..4673c625a7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java index b032bddfdb..b88d1fbde8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java index 87dbc92199..2aa4bc7349 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java index 1bc39443fa..9b7504fe89 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -227,6 +227,16 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; @@ -234,16 +244,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java index 738d1de7f1..7210a7fbcb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index b93149d928..0423214997 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b621ac99a1..b2b77ee360 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index 99060558ba..4552b070ca 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index dd517c64b5..47818b2159 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 29208b2b65..8e5328b099 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index ee48777edd..70233cec08 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.vip.VipManager; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9f908898ea..ebdbe02899 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index d60e1343b9..1f55ed1bae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 2e75866e00..0b472089a8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index fcd8e14da5..2613a1847b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index bab8b12ab1..9f4fdbdfc9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index 952f083c90..3f89277658 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index dc2add2a3a..8c8b2b019d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -130,15 +130,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index 92bce4268b..14cccac24d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 16644245de..c792f858bb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index 574e07a8e7..a6b878697e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Armor.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Armor.java new file mode 100644 index 0000000000..6d53c84197 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -0,0 +1,87 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.ArmorType; + +/** + * This class is dedicated to the management of armors. + */ +public class Armor extends ItemTemplate +{ + private ArmorType _type; + + /** + * Constructor for Armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. + */ + public Armor(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); + + final int bodyPart = getBodyPart(); + if ((bodyPart == ItemTemplate.SLOT_NECK) || ((bodyPart & ItemTemplate.SLOT_L_EAR) != 0) || ((bodyPart & ItemTemplate.SLOT_L_FINGER) != 0) || ((bodyPart & ItemTemplate.SLOT_R_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_L_BRACELET) != 0)) + { + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_ACCESSORY; + } + else + { + if ((_type == ArmorType.NONE) && (getBodyPart() == ItemTemplate.SLOT_L_HAND)) + { + _type = ArmorType.SHIELD; + } + _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; + _type2 = ItemTemplate.TYPE2_SHIELD_ARMOR; + } + } + + /** + * @return the type of the armor. + */ + @Override + public ArmorType getItemType() + { + return _type; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise + */ + @Override + public boolean isArmor() + { + return true; + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Henna.java similarity index 94% rename from L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Henna.java rename to L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Henna.java index 09fdb7abcb..d029309b0f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.HashMap; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index 3ec1dae5c6..bafd58fe54 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 91% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index d47f84330a..e092feea62 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.Collection; import java.util.Objects; @@ -22,9 +22,9 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Weapon.java new file mode 100644 index 0000000000..3ae599da0d --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -0,0 +1,311 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.enums.ItemSkillType; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is dedicated to the management of weapons. + */ +public class Weapon extends ItemTemplate +{ + private WeaponType _type; + private boolean _isMagicWeapon; + private int _soulShotCount; + private int _spiritShotCount; + private int _mpConsume; + private int _baseAttackRange; + private int _baseAttackRadius; + private int _baseAttackAngle; + private int _changeWeaponId; + + private int _reducedSoulshot; + private int _reducedSoulshotChance; + + private int _reducedMpConsume; + private int _reducedMpConsumeChance; + + private boolean _isForceEquip; + private boolean _isAttackWeapon; + private boolean _useWeaponSkillsOnly; + + /** + * Constructor for Weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. + */ + public Weapon(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_WEAPON; + _isMagicWeapon = set.getBoolean("is_magic_weapon", false); + _soulShotCount = set.getInt("soulshots", 0); + _spiritShotCount = set.getInt("spiritshots", 0); + _mpConsume = set.getInt("mp_consume", 0); + _baseAttackRange = set.getInt("attack_range", 40); + final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) + { + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + } + else + { + _baseAttackRadius = 40; + _baseAttackAngle = 240; // 360 - 120 + } + + final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); + _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; + _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; + + final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); + _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; + _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; + _changeWeaponId = set.getInt("change_weaponId", 0); + _isForceEquip = set.getBoolean("isForceEquip", false); + _isAttackWeapon = set.getBoolean("isAttackWeapon", true); + _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); + } + + /** + * @return the type of Weapon + */ + @Override + public WeaponType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + @Override + public boolean isWeapon() + { + return true; + } + + /** + * @return {@code true} if the weapon is magic, {@code false} otherwise. + */ + @Override + public boolean isMagicWeapon() + { + return _isMagicWeapon; + } + + /** + * @return the quantity of SoulShot used. + */ + public int getSoulShotCount() + { + return _soulShotCount; + } + + /** + * @return the quantity of SpiritShot used. + */ + public int getSpiritShotCount() + { + return _spiritShotCount; + } + + /** + * @return the reduced quantity of SoultShot used. + */ + public int getReducedSoulShot() + { + return _reducedSoulshot; + } + + /** + * @return the chance to use Reduced SoultShot. + */ + public int getReducedSoulShotChance() + { + return _reducedSoulshotChance; + } + + /** + * @return the MP consumption with the weapon. + */ + public int getMpConsume() + { + return _mpConsume; + } + + public int getBaseAttackRange() + { + return _baseAttackRange; + } + + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + + /** + * @return the reduced MP consumption with the weapon. + */ + public int getReducedMpConsume() + { + return _reducedMpConsume; + } + + /** + * @return the chance to use getReducedMpConsume() + */ + public int getReducedMpConsumeChance() + { + return _reducedMpConsumeChance; + } + + /** + * @return the Id in which weapon this weapon can be changed. + */ + public int getChangeWeaponId() + { + return _changeWeaponId; + } + + /** + * @return {@code true} if the weapon is force equip, {@code false} otherwise. + */ + public boolean isForceEquip() + { + return _isForceEquip; + } + + /** + * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. + */ + public boolean isAttackWeapon() + { + return _isAttackWeapon; + } + + /** + * @return {@code true} if the weapon is skills only, {@code false} otherwise. + */ + public boolean useWeaponSkillsOnly() + { + return _useWeaponSkillsOnly; + } + + /** + * @param caster the Creature pointing out the caster + * @param target the Creature pointing out the target + * @param trigger + * @param type + */ + public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) + { + forEachSkill(type, holder -> + { + final Skill skill = holder.getSkill(); + if (Rnd.get(100) >= holder.getChance()) + { + return; + } + + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // Trigger only if both are good or bad magic. + if (trigger.isBad() != skill.isBad()) + { + return; + } + + // No Trigger if not Magic Skill or is toggle + if (trigger.isMagic() != skill.isMagic()) + { + return; + } + + // No Trigger if skill is toggle + if (trigger.isToggle()) + { + return; + } + + if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) + { + return; + } + } + + // Skill condition not met + if (!skill.checkCondition(caster, target)) + { + return; + } + + skill.activateSkill(caster, target); + + // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // notify quests of a skill use + if (caster.isPlayer()) + { + World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); + } + if (caster.isPlayer()) + { + final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); + sm.addSkillName(skill); + caster.sendPacket(sm); + } + } + }); + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java new file mode 100644 index 0000000000..4736db96a7 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -0,0 +1,558 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.network.SystemMessageId; + +/** + * @author UnAfraid + */ +public class AppearanceStone +{ + private final int _id; + private final int _cost; + private final int _visualId; + private final long _lifeTime; + private final AppearanceType _type; + private final WeaponType _weaponType; + private final ArmorType _armorType; + private final AppearanceHandType _handType; + private final AppearanceMagicType _magicType; + private List _crystalTypes; + private List _targetTypes; + private List _bodyParts; + private List _races; + private List _racesNot; + private List _allVisualIds; + + public AppearanceStone(StatSet set) + { + _id = set.getInt("id"); + _visualId = set.getInt("visualId", 0); + _cost = set.getInt("cost", 0); + _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); + _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); + _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); + _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); + _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); + _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); + + final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); + if (targetType != AppearanceTargetType.NONE) + { + addTargetType(targetType); + } + + // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. + final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); + + // If no crystal type is defined, we must add all defaults. + if (crystalType == null) + { + switch (targetType) + { + case ACCESSORY: + case ALL: + { + addCrystalType(CrystalType.NONE); + // fallthrough + } + case WEAPON: + case ARMOR: + { + for (CrystalType cryType : CrystalType.values()) + { + if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) + { + addCrystalType(cryType); + } + } + } + } + } + else + { + addCrystalType(crystalType); + } + + final int bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); + if (bodyPart != ItemTemplate.SLOT_NONE) + { + addBodyPart(bodyPart); + } + + final Race race = set.getEnum("race", Race.class, Race.NONE); + if (race != Race.NONE) + { + addRace(race); + } + + final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); + if (raceNot != Race.NONE) + { + addRaceNot(raceNot); + } + } + + public int getId() + { + return _id; + } + + public int getVisualId() + { + return _visualId; + } + + public int getCost() + { + return _cost; + } + + public long getLifeTime() + { + return _lifeTime; + } + + public AppearanceType getType() + { + return _type; + } + + public WeaponType getWeaponType() + { + return _weaponType; + } + + public ArmorType getArmorType() + { + return _armorType; + } + + public AppearanceHandType getHandType() + { + return _handType; + } + + public AppearanceMagicType getMagicType() + { + return _magicType; + } + + public void addCrystalType(CrystalType type) + { + if (_crystalTypes == null) + { + _crystalTypes = new ArrayList<>(); + } + _crystalTypes.add(type); + } + + public List getCrystalTypes() + { + return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); + } + + public void addTargetType(AppearanceTargetType type) + { + if (_targetTypes == null) + { + _targetTypes = new ArrayList<>(); + } + _targetTypes.add(type); + } + + public List getTargetTypes() + { + return _targetTypes != null ? _targetTypes : Collections.emptyList(); + } + + public void addBodyPart(Integer part) + { + if (_bodyParts == null) + { + _bodyParts = new ArrayList<>(); + } + _bodyParts.add(part); + } + + public void addVisualId(AppearanceHolder appearanceHolder) + { + if (_allVisualIds == null) + { + _allVisualIds = new ArrayList<>(); + } + _allVisualIds.add(appearanceHolder); + } + + public List getVisualIds() + { + return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); + } + + public List getBodyParts() + { + return _bodyParts != null ? _bodyParts : Collections.emptyList(); + } + + public void addRace(Race race) + { + if (_races == null) + { + _races = new ArrayList<>(); + } + _races.add(race); + } + + public List getRaces() + { + return _races != null ? _races : Collections.emptyList(); + } + + public void addRaceNot(Race race) + { + if (_racesNot == null) + { + _racesNot = new ArrayList<>(); + } + _racesNot.add(race); + } + + public List getRacesNot() + { + return _racesNot != null ? _racesNot : Collections.emptyList(); + } + + /** + * @param player the actor requesting to use this appearance. + * @param targetItem the item to be modified with this appearance. + * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. + */ + public boolean checkConditions(Player player, Item targetItem) + { + if (targetItem == null) + { + return false; + } + + if (getTargetTypes().isEmpty()) + { + return false; + } + + if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); + return false; + } + + switch (_type) + { + case RESTORE: + { + if (targetItem.getVisualId() == 0) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); + return false; + } + + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + default: + { + // Seems like in retail item with already changed appearance, can be changed again without being restored. + + final AppearanceTargetType targetType = getTargetTypes().get(0); + switch (targetType) + { + case NONE: + { + return false; + } + case WEAPON: + { + if (!targetItem.isWeapon()) + { + player.sendPacket(SystemMessageId.WEAPONS_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ARMOR: + { + if (!targetItem.isArmor()) + { + player.sendPacket(SystemMessageId.ARMOR_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ACCESSORY: + { + if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + { + player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); + return false; + } + break; + } + case ALL: + { + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (findVisualChange(targetItem) == null) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + return true; + } + } + break; + } + } + + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (_weaponType != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) + { + if (_weaponType != WeaponType.CROSSBOW) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + } + + switch (_handType) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + } + + switch (_magicType) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + if (_armorType != ArmorType.NONE) + { + switch (_armorType) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + return true; + } + + public AppearanceHolder findVisualChange(Item targetItem) + { + for (AppearanceHolder holder : _allVisualIds) + { + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + { + continue; + } + + if (holder.getWeaponType() != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) + { + if (holder.getWeaponType() != WeaponType.CROSSBOW) + { + continue; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + continue; + } + } + + switch (holder.getHandType()) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + continue; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + continue; + } + break; + } + } + + switch (holder.getMagicType()) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + continue; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + continue; + } + } + } + } + + if (holder.getArmorType() != ArmorType.NONE) + { + switch (holder.getArmorType()) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + continue; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + continue; + } + } + } + } + return holder; + } + return null; + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java new file mode 100644 index 0000000000..6f73983c0e --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -0,0 +1,65 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import java.util.EnumMap; +import java.util.Map; + +import org.l2jmobius.gameserver.model.StatSet; + +/** + * @author UnAfraid + */ +public class CombinationItem +{ + private final int _itemOne; + private final int _itemTwo; + private final int _chance; + private final Map _rewards = new EnumMap<>(CombinationItemType.class); + + public CombinationItem(StatSet set) + { + _itemOne = set.getInt("one"); + _itemTwo = set.getInt("two"); + _chance = set.getInt("chance"); + } + + public int getItemOne() + { + return _itemOne; + } + + public int getItemTwo() + { + return _itemTwo; + } + + public int getChance() + { + return _chance; + } + + public void addReward(CombinationItemReward item) + { + _rewards.put(item.getType(), item); + } + + public CombinationItemReward getReward(CombinationItemType type) + { + return _rewards.get(type); + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java similarity index 90% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java rename to L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index a09b01d571..8890655085 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..6b234768e4 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private int _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(int slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 93% rename from L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index e2c2f6ad68..9a80e104b0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.stats.Stat; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java similarity index 89% rename from L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java rename to L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java index 13d6b5a2ee..bfe1c295da 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java index f891d3f3bc..4c2b67c766 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -69,14 +69,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent; import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java similarity index 93% rename from L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java rename to L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java index d059efd025..c8a309674f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * Crystal Type enumerated. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 93% rename from L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index b352bd7fc0..834b0c3996 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * EtcItem Type enumerated. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index ffc84ab3a9..77a0e89162 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index f4d1342b5f..4a4304845a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -51,14 +51,14 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 4052d539f3..8251a576c8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Armor.java deleted file mode 100644 index 6a27c29819..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Armor.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; - -/** - * This class is dedicated to the management of armors. - */ -public class Armor extends ItemTemplate -{ - private ArmorType _type; - - /** - * Constructor for Armor. - * @param set the StatSet designating the set of couples (key,value) characterizing the armor. - */ - public Armor(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); - - final int bodyPart = getBodyPart(); - if ((bodyPart == ItemTemplate.SLOT_NECK) || ((bodyPart & ItemTemplate.SLOT_L_EAR) != 0) || ((bodyPart & ItemTemplate.SLOT_L_FINGER) != 0) || ((bodyPart & ItemTemplate.SLOT_R_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_L_BRACELET) != 0)) - { - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_ACCESSORY; - } - else - { - if ((_type == ArmorType.NONE) && (getBodyPart() == ItemTemplate.SLOT_L_HAND)) - { - _type = ArmorType.SHIELD; - } - _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; - _type2 = ItemTemplate.TYPE2_SHIELD_ARMOR; - } - } - - /** - * @return the type of the armor. - */ - @Override - public ArmorType getItemType() - { - return _type; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise - */ - @Override - public boolean isArmor() - { - return true; - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Weapon.java deleted file mode 100644 index 85bb22d23b..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is dedicated to the management of weapons. - */ -public class Weapon extends ItemTemplate -{ - private WeaponType _type; - private boolean _isMagicWeapon; - private int _soulShotCount; - private int _spiritShotCount; - private int _mpConsume; - private int _baseAttackRange; - private int _baseAttackRadius; - private int _baseAttackAngle; - private int _changeWeaponId; - - private int _reducedSoulshot; - private int _reducedSoulshotChance; - - private int _reducedMpConsume; - private int _reducedMpConsumeChance; - - private boolean _isForceEquip; - private boolean _isAttackWeapon; - private boolean _useWeaponSkillsOnly; - - /** - * Constructor for Weapon. - * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. - */ - public Weapon(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_WEAPON; - _isMagicWeapon = set.getBoolean("is_magic_weapon", false); - _soulShotCount = set.getInt("soulshots", 0); - _spiritShotCount = set.getInt("spiritshots", 0); - _mpConsume = set.getInt("mp_consume", 0); - _baseAttackRange = set.getInt("attack_range", 40); - final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) - { - _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); - } - else - { - _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 - } - - final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); - _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; - _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; - - final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); - _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; - _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; - _changeWeaponId = set.getInt("change_weaponId", 0); - _isForceEquip = set.getBoolean("isForceEquip", false); - _isAttackWeapon = set.getBoolean("isAttackWeapon", true); - _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); - } - - /** - * @return the type of Weapon - */ - @Override - public WeaponType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - @Override - public boolean isWeapon() - { - return true; - } - - /** - * @return {@code true} if the weapon is magic, {@code false} otherwise. - */ - @Override - public boolean isMagicWeapon() - { - return _isMagicWeapon; - } - - /** - * @return the quantity of SoulShot used. - */ - public int getSoulShotCount() - { - return _soulShotCount; - } - - /** - * @return the quantity of SpiritShot used. - */ - public int getSpiritShotCount() - { - return _spiritShotCount; - } - - /** - * @return the reduced quantity of SoultShot used. - */ - public int getReducedSoulShot() - { - return _reducedSoulshot; - } - - /** - * @return the chance to use Reduced SoultShot. - */ - public int getReducedSoulShotChance() - { - return _reducedSoulshotChance; - } - - /** - * @return the MP consumption with the weapon. - */ - public int getMpConsume() - { - return _mpConsume; - } - - public int getBaseAttackRange() - { - return _baseAttackRange; - } - - public int getBaseAttackRadius() - { - return _baseAttackRadius; - } - - public int getBaseAttackAngle() - { - return _baseAttackAngle; - } - - /** - * @return the reduced MP consumption with the weapon. - */ - public int getReducedMpConsume() - { - return _reducedMpConsume; - } - - /** - * @return the chance to use getReducedMpConsume() - */ - public int getReducedMpConsumeChance() - { - return _reducedMpConsumeChance; - } - - /** - * @return the Id in which weapon this weapon can be changed. - */ - public int getChangeWeaponId() - { - return _changeWeaponId; - } - - /** - * @return {@code true} if the weapon is force equip, {@code false} otherwise. - */ - public boolean isForceEquip() - { - return _isForceEquip; - } - - /** - * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. - */ - public boolean isAttackWeapon() - { - return _isAttackWeapon; - } - - /** - * @return {@code true} if the weapon is skills only, {@code false} otherwise. - */ - public boolean useWeaponSkillsOnly() - { - return _useWeaponSkillsOnly; - } - - /** - * @param caster the Creature pointing out the caster - * @param target the Creature pointing out the target - * @param trigger - * @param type - */ - public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) - { - forEachSkill(type, holder -> - { - final Skill skill = holder.getSkill(); - if (Rnd.get(100) >= holder.getChance()) - { - return; - } - - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // Trigger only if both are good or bad magic. - if (trigger.isBad() != skill.isBad()) - { - return; - } - - // No Trigger if not Magic Skill or is toggle - if (trigger.isMagic() != skill.isMagic()) - { - return; - } - - // No Trigger if skill is toggle - if (trigger.isToggle()) - { - return; - } - - if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) - { - return; - } - } - - // Skill condition not met - if (!skill.checkCondition(caster, target)) - { - return; - } - - skill.activateSkill(caster, target); - - // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // notify quests of a skill use - if (caster.isPlayer()) - { - World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); - } - if (caster.isPlayer()) - { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); - sm.addSkillName(skill); - caster.sendPacket(sm); - } - } - }); - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java deleted file mode 100644 index aafdba599e..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ /dev/null @@ -1,558 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author UnAfraid - */ -public class AppearanceStone -{ - private final int _id; - private final int _cost; - private final int _visualId; - private final long _lifeTime; - private final AppearanceType _type; - private final WeaponType _weaponType; - private final ArmorType _armorType; - private final AppearanceHandType _handType; - private final AppearanceMagicType _magicType; - private List _crystalTypes; - private List _targetTypes; - private List _bodyParts; - private List _races; - private List _racesNot; - private List _allVisualIds; - - public AppearanceStone(StatSet set) - { - _id = set.getInt("id"); - _visualId = set.getInt("visualId", 0); - _cost = set.getInt("cost", 0); - _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); - _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); - _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); - _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); - _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); - _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); - - final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); - if (targetType != AppearanceTargetType.NONE) - { - addTargetType(targetType); - } - - // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. - final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); - - // If no crystal type is defined, we must add all defaults. - if (crystalType == null) - { - switch (targetType) - { - case ACCESSORY: - case ALL: - { - addCrystalType(CrystalType.NONE); - // fallthrough - } - case WEAPON: - case ARMOR: - { - for (CrystalType cryType : CrystalType.values()) - { - if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) - { - addCrystalType(cryType); - } - } - } - } - } - else - { - addCrystalType(crystalType); - } - - final int bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); - if (bodyPart != ItemTemplate.SLOT_NONE) - { - addBodyPart(bodyPart); - } - - final Race race = set.getEnum("race", Race.class, Race.NONE); - if (race != Race.NONE) - { - addRace(race); - } - - final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); - if (raceNot != Race.NONE) - { - addRaceNot(raceNot); - } - } - - public int getId() - { - return _id; - } - - public int getVisualId() - { - return _visualId; - } - - public int getCost() - { - return _cost; - } - - public long getLifeTime() - { - return _lifeTime; - } - - public AppearanceType getType() - { - return _type; - } - - public WeaponType getWeaponType() - { - return _weaponType; - } - - public ArmorType getArmorType() - { - return _armorType; - } - - public AppearanceHandType getHandType() - { - return _handType; - } - - public AppearanceMagicType getMagicType() - { - return _magicType; - } - - public void addCrystalType(CrystalType type) - { - if (_crystalTypes == null) - { - _crystalTypes = new ArrayList<>(); - } - _crystalTypes.add(type); - } - - public List getCrystalTypes() - { - return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); - } - - public void addTargetType(AppearanceTargetType type) - { - if (_targetTypes == null) - { - _targetTypes = new ArrayList<>(); - } - _targetTypes.add(type); - } - - public List getTargetTypes() - { - return _targetTypes != null ? _targetTypes : Collections.emptyList(); - } - - public void addBodyPart(Integer part) - { - if (_bodyParts == null) - { - _bodyParts = new ArrayList<>(); - } - _bodyParts.add(part); - } - - public void addVisualId(AppearanceHolder appearanceHolder) - { - if (_allVisualIds == null) - { - _allVisualIds = new ArrayList<>(); - } - _allVisualIds.add(appearanceHolder); - } - - public List getVisualIds() - { - return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); - } - - public List getBodyParts() - { - return _bodyParts != null ? _bodyParts : Collections.emptyList(); - } - - public void addRace(Race race) - { - if (_races == null) - { - _races = new ArrayList<>(); - } - _races.add(race); - } - - public List getRaces() - { - return _races != null ? _races : Collections.emptyList(); - } - - public void addRaceNot(Race race) - { - if (_racesNot == null) - { - _racesNot = new ArrayList<>(); - } - _racesNot.add(race); - } - - public List getRacesNot() - { - return _racesNot != null ? _racesNot : Collections.emptyList(); - } - - /** - * @param player the actor requesting to use this appearance. - * @param targetItem the item to be modified with this appearance. - * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. - */ - public boolean checkConditions(Player player, Item targetItem) - { - if (targetItem == null) - { - return false; - } - - if (getTargetTypes().isEmpty()) - { - return false; - } - - if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); - return false; - } - - switch (_type) - { - case RESTORE: - { - if (targetItem.getVisualId() == 0) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); - return false; - } - - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - default: - { - // Seems like in retail item with already changed appearance, can be changed again without being restored. - - final AppearanceTargetType targetType = getTargetTypes().get(0); - switch (targetType) - { - case NONE: - { - return false; - } - case WEAPON: - { - if (!targetItem.isWeapon()) - { - player.sendPacket(SystemMessageId.WEAPONS_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ARMOR: - { - if (!targetItem.isArmor()) - { - player.sendPacket(SystemMessageId.ARMOR_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ACCESSORY: - { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) - { - player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); - return false; - } - break; - } - case ALL: - { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (findVisualChange(targetItem) == null) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - return true; - } - } - break; - } - } - - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (_weaponType != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) - { - if (_weaponType != WeaponType.CROSSBOW) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - } - - switch (_handType) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - } - - switch (_magicType) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - if (_armorType != ArmorType.NONE) - { - switch (_armorType) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - return true; - } - - public AppearanceHolder findVisualChange(Item targetItem) - { - for (AppearanceHolder holder : _allVisualIds) - { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) - { - continue; - } - - if (holder.getWeaponType() != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) - { - if (holder.getWeaponType() != WeaponType.CROSSBOW) - { - continue; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - continue; - } - } - - switch (holder.getHandType()) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - continue; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - continue; - } - break; - } - } - - switch (holder.getMagicType()) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - continue; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - continue; - } - } - } - } - - if (holder.getArmorType() != ArmorType.NONE) - { - switch (holder.getArmorType()) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - continue; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - continue; - } - } - } - } - return holder; - } - return null; - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java deleted file mode 100644 index a2897ba911..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import java.util.EnumMap; -import java.util.Map; - -import org.l2jmobius.gameserver.model.StatSet; - -/** - * @author UnAfraid - */ -public class CombinationItem -{ - private final int _itemOne; - private final int _itemTwo; - private final int _chance; - private final Map _rewards = new EnumMap<>(CombinationItemType.class); - - public CombinationItem(StatSet set) - { - _itemOne = set.getInt("one"); - _itemTwo = set.getInt("two"); - _chance = set.getInt("chance"); - } - - public int getItemOne() - { - return _itemOne; - } - - public int getItemTwo() - { - return _itemTwo; - } - - public int getChance() - { - return _chance; - } - - public void addReward(CombinationItemReward item) - { - _rewards.put(item.getType(), item); - } - - public CombinationItemReward getReward(CombinationItemType type) - { - return _rewards.get(type); - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fb23338d90..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private int _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(int slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c807e1298e..0fcb8c33e4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 5bf10abc0f..7929fbbe60 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java index 7d30237cb1..d9c41811d2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java index 80eec709d8..1e18bcb9ad 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 527e0b0938..f93380fc15 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 777ba0c3c7..ba26674462 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 7d1dab62cf..28d35439a8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 98ad03f40d..5e9d4175d5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 38a7116383..ff0ad75b8a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 043806dfb4..d8f3930287 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 1839afb5ce..334fb9252a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 7109a54ed1..5df6b208a3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index 165f9b4668..80e30184ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index df3acc3df1..7c51b0ad38 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index bab0af38a8..1c31ff4a11 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index f467c9e4c3..e25524223a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index e0fa4026cc..74ae6af035 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index dc02d363c8..ea86074f0e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 543774b24c..e1c584d405 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 8e4db9d92c..a7e3f28ed6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 9dfcf81ebd..5d4b260a76 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 85dbfd4647..ed78abf81d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index eee07594d3..c67449efed 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 48a67946e9..3ee4350b8d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index ede2fd556c..b79b9196fa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 21dcd2d13d..9565b3e5ca 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 6b1a6a94e8..1b20e2e248 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 96d170857a..2330851024 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 7e7abde686..66fb839f0e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index ce98ab493d..d0add3fa49 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 595da81538..ab9f0c33f7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 945ff531e4..b9c3900403 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 8626434905..e4376f9ad5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index d92fbb028a..26cfaf9835 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d498c232c5..d66024cc52 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 13b2d241e5..33a10fd20c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index fb025563e6..d7d4d2b449 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 60cfa6b927..6d1eea218a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 4c5880c23a..ee93527570 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 6bc227a559..3de872e222 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 4d836680da..0bf083a345 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index b1f9daa6ca..b42c56a13c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 81e3a8f4c9..7e89bd6ed3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index feb10d169b..b1da943024 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 56cf3b84cc..b9a7aadbf7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 59c63fceca..acee799091 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index a4f0ecaefb..d5690408da 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51f689b277..8b40712b46 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index a80a619158..9964cd1f64 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b15e77740f..cfa4f6759d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 3ec3d494e8..db168592f1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 942a5f1cdc..b739a94c55 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 235c3abacf..29d5eafeef 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c9e5eabc7..ef1d37297e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index a8903175db..f212539af7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index b690bd9455..c14caa76e0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 312fd10338..9ab9f0a836 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 6d0df16c27..0e6e64c7b2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 61a01d067c..658087380a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 84bc5a6eba..3800940bac 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 62efb91d9e..a79c0f59f2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index e744eecbdd..8735b315b6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 8fbd06fc5f..d9901a9961 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index faf957b0c9..d499719f31 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index f27cf60885..bb462b6cd2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index d8f88333df..df50db952f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index ca4a4ee04c..c2fedd99c0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index d48b66c6ef..9d9b24a54f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 84ee2d06c6..470ce757db 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index bcc376c327..455305ce79 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index fcc27f821d..64fb395dda 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 1cf1f17260..876a24c7ad 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java index 3c87faec44..f61481565a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.vip; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/DocumentBase.java index 65e18e4a0e..bcbe96ad19 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -134,9 +137,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/SiegeGuards.java index 8ac4fe72af..c9ca7df743 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index fa45b28c67..42d382f269 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index dd4215411e..a8e6c06eed 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 9a1bfbc322..4afd6e9f3c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 1ff3d6ae84..ee5c5e5649 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index a1dac8e67f..4a0debf3a8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 6a67c2d642..2e5b2846bf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index dd5c2f593d..2ea2bf9f11 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 4e5a8d7aaf..1950403a0d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d5d2ad10cf..8f4db5d580 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 24d5d75b7a..704f15e5ba 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index a403724d9a..10d1c9e03b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2b6db19588..607dc3b8f5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 4fdcb5ca9a..a4f5e2fc18 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index c6430fd345..8eaf69885f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index 1866a34d94..b7c74b3b74 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 7f55fdc9ed..7e0edf65b8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 28b0f453fc..5c2f25e7f2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 2ed9c1c346..7f5e0e87a1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index ebbd33bda0..f952b58fa2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 189a2f7e73..714a195ccb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 7d2f4894c6..770b66ee92 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 02468039cf..742f98e38b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 742ca00283..3d97c9ac22 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 3eb4d77710..8b4d315b50 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index a88c6c50c5..0aa5cb3e1f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6f313482ab..54230f39a1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b4ea6e761f..bfc5324c4d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 410e71cff8..01714d7f5a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VipUp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VipUp.java index 9cf1267bbb..f716953da2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VipUp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VipUp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index ecb73b365e..30e5fd51af 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 80351144d6..44599b2555 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 2472a2d955..85d614b478 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index d1d5c8c332..c2610ec4e3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index abf3b47d43..d0c1cf040c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 3ae04b22f4..c32e1327ea 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index a02dc34079..8167aa1eef 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 02629d5d34..e17c4d3c90 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27f0904f0f..a61cc1bd71 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 255f805e72..12f575b243 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index 3988e77104..587f809dc9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 0ff861388c..75ab0bae7e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java index 4e5984b292..efde71ba49 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java index e70725593d..954c6b4142 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java index a3a6734f90..13e468df91 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.QuestSoundHtmlHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java index d29aaf54b5..7773083c9a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java index cb732dea8c..bd13a4bbe9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java index 00920614ce..0d21264633 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java index bb78cafa1c..670e0a7192 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/ItemTable.java index 9197c33197..914259543f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index 8188d90cc5..3bfdfb138c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 99e8b8b3d2..1c3099e6c4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index d134fe859e..c57e62c683 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index e131a0f0e5..3359c09da3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 07af46b4a4..339a7e047c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index d2337f0f98..df1c988200 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 0f7be781b2..7bc7be8487 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index ba3ab89b07..20d23bc7fc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 85c1538ea4..3e02ce19ab 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -35,9 +35,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 3d21c7ddf0..5f3eb28e8a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ArmorSet.java index 4d11cf0970..a84709e2db 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/CombatFlag.java index dc49fce1cc..7385a9fc13 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/CursedWeapon.java index f34fda05ad..806375ccc4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java index ec67ca4a4a..5244307c22 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java @@ -45,8 +45,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ShortCuts.java index a9796fbbb7..36f3461010 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TradeList.java index ba25090b4c..27c50e5787 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 5012c48eca..4673c625a7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java index b032bddfdb..b88d1fbde8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java index 87dbc92199..2aa4bc7349 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java index b2696b0637..666a8a69f4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -227,6 +227,16 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; @@ -234,16 +244,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Summon.java index 738d1de7f1..7210a7fbcb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index b93149d928..0423214997 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b621ac99a1..b2b77ee360 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index 99060558ba..4552b070ca 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 624c0121ea..a4cd7011cc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 29208b2b65..8e5328b099 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index ee48777edd..70233cec08 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.vip.VipManager; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9f908898ea..ebdbe02899 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index d60e1343b9..1f55ed1bae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 2e75866e00..0b472089a8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index fcd8e14da5..2613a1847b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index bab8b12ab1..9f4fdbdfc9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index 952f083c90..3f89277658 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index dc2add2a3a..8c8b2b019d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -130,15 +130,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index 92bce4268b..14cccac24d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 16644245de..c792f858bb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index 574e07a8e7..a6b878697e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/Armor.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/Armor.java new file mode 100644 index 0000000000..6d53c84197 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -0,0 +1,87 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.ArmorType; + +/** + * This class is dedicated to the management of armors. + */ +public class Armor extends ItemTemplate +{ + private ArmorType _type; + + /** + * Constructor for Armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. + */ + public Armor(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); + + final int bodyPart = getBodyPart(); + if ((bodyPart == ItemTemplate.SLOT_NECK) || ((bodyPart & ItemTemplate.SLOT_L_EAR) != 0) || ((bodyPart & ItemTemplate.SLOT_L_FINGER) != 0) || ((bodyPart & ItemTemplate.SLOT_R_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_L_BRACELET) != 0)) + { + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_ACCESSORY; + } + else + { + if ((_type == ArmorType.NONE) && (getBodyPart() == ItemTemplate.SLOT_L_HAND)) + { + _type = ArmorType.SHIELD; + } + _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; + _type2 = ItemTemplate.TYPE2_SHIELD_ARMOR; + } + } + + /** + * @return the type of the armor. + */ + @Override + public ArmorType getItemType() + { + return _type; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise + */ + @Override + public boolean isArmor() + { + return true; + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/Henna.java similarity index 94% rename from L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Henna.java rename to L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/Henna.java index 09fdb7abcb..d029309b0f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.HashMap; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index 3ec1dae5c6..bafd58fe54 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java new file mode 100644 index 0000000000..e092feea62 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -0,0 +1,300 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.Collection; +import java.util.Objects; + +import org.l2jmobius.gameserver.enums.AttributeType; +import org.l2jmobius.gameserver.model.VariationInstance; +import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * This class contains Item
+ * Use to sort Item of : + *
    + *
  • Armor
    • + *
  • EtcItem
    • + *
  • Weapon
    • + *
+ * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ + */ +public class WarehouseItem +{ + private final ItemTemplate _item; + private final int _object; + private final long _count; + private final int _owner; + private final int _locationSlot; + private final int _enchant; + private final CrystalType _grade; + private final VariationInstance _augmentation; + private final int _customType1; + private final int _customType2; + private final int _mana; + + private byte _elemAtkType = -2; + private int _elemAtkPower = 0; + + private final int[] _elemDefAttr = + { + 0, + 0, + 0, + 0, + 0, + 0 + }; + + private final int[] _enchantOptions; + private final Collection _soulCrystalOptions; + private final Collection _soulCrystalSpecialOptions; + + private final int _time; + + public WarehouseItem(Item item) + { + Objects.requireNonNull(item); + _item = item.getItem(); + _object = item.getObjectId(); + _count = item.getCount(); + _owner = item.getOwnerId(); + _locationSlot = item.getLocationSlot(); + _enchant = item.getEnchantLevel(); + _customType1 = item.getCustomType1(); + _customType2 = item.getCustomType2(); + _grade = item.getItem().getCrystalType(); + _augmentation = item.getAugmentation(); + _mana = item.getMana(); + _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; + _elemAtkType = item.getAttackAttributeType().getClientId(); + _elemAtkPower = item.getAttackAttributePower(); + for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) + { + _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); + } + _enchantOptions = item.getEnchantOptions(); + _soulCrystalOptions = item.getSpecialAbilities(); + _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); + } + + /** + * @return the item. + */ + public ItemTemplate getItem() + { + return _item; + } + + /** + * @return the unique objectId. + */ + public int getObjectId() + { + return _object; + } + + /** + * @return the owner. + */ + public int getOwnerId() + { + return _owner; + } + + /** + * @return the location slot. + */ + public int getLocationSlot() + { + return _locationSlot; + } + + /** + * @return the count. + */ + public long getCount() + { + return _count; + } + + /** + * @return the first type. + */ + public int getType1() + { + return _item.getType1(); + } + + /** + * @return the second type. + */ + public int getType2() + { + return _item.getType2(); + } + + /** + * @return the second type. + */ + public ItemType getItemType() + { + return _item.getItemType(); + } + + /** + * @return the ItemId. + */ + public int getItemId() + { + return _item.getId(); + } + + /** + * @return the part of body used with this item. + */ + public int getBodyPart() + { + return _item.getBodyPart(); + } + + /** + * @return the enchant level. + */ + public int getEnchantLevel() + { + return _enchant; + } + + /** + * @return the item grade + */ + public CrystalType getItemGrade() + { + return _grade; + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + public boolean isWeapon() + { + return (_item instanceof Weapon); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise. + */ + public boolean isArmor() + { + return (_item instanceof Armor); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + public boolean isEtcItem() + { + return (_item instanceof EtcItem); + } + + /** + * @return the name of the item + */ + public String getItemName() + { + return _item.getName(); + } + + /** + * @return the augmentation If. + */ + public VariationInstance getAugmentation() + { + return _augmentation; + } + + /** + * @return the name of the item + */ + public String getName() + { + return _item.getName(); + } + + public int getCustomType1() + { + return _customType1; + } + + public int getCustomType2() + { + return _customType2; + } + + public int getMana() + { + return _mana; + } + + public byte getAttackElementType() + { + return _elemAtkType; + } + + public int getAttackElementPower() + { + return _elemAtkPower; + } + + public int getElementDefAttr(byte i) + { + return _elemDefAttr[i]; + } + + public int[] getEnchantOptions() + { + return _enchantOptions; + } + + public Collection getSoulCrystalOptions() + { + return _soulCrystalOptions; + } + + public Collection getSoulCrystalSpecialOptions() + { + return _soulCrystalSpecialOptions; + } + + public int getTime() + { + return _time; + } + + /** + * @return the name of the item + */ + @Override + public String toString() + { + return _item.toString(); + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/Weapon.java new file mode 100644 index 0000000000..3ae599da0d --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -0,0 +1,311 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.enums.ItemSkillType; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is dedicated to the management of weapons. + */ +public class Weapon extends ItemTemplate +{ + private WeaponType _type; + private boolean _isMagicWeapon; + private int _soulShotCount; + private int _spiritShotCount; + private int _mpConsume; + private int _baseAttackRange; + private int _baseAttackRadius; + private int _baseAttackAngle; + private int _changeWeaponId; + + private int _reducedSoulshot; + private int _reducedSoulshotChance; + + private int _reducedMpConsume; + private int _reducedMpConsumeChance; + + private boolean _isForceEquip; + private boolean _isAttackWeapon; + private boolean _useWeaponSkillsOnly; + + /** + * Constructor for Weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. + */ + public Weapon(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_WEAPON; + _isMagicWeapon = set.getBoolean("is_magic_weapon", false); + _soulShotCount = set.getInt("soulshots", 0); + _spiritShotCount = set.getInt("spiritshots", 0); + _mpConsume = set.getInt("mp_consume", 0); + _baseAttackRange = set.getInt("attack_range", 40); + final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) + { + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + } + else + { + _baseAttackRadius = 40; + _baseAttackAngle = 240; // 360 - 120 + } + + final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); + _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; + _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; + + final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); + _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; + _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; + _changeWeaponId = set.getInt("change_weaponId", 0); + _isForceEquip = set.getBoolean("isForceEquip", false); + _isAttackWeapon = set.getBoolean("isAttackWeapon", true); + _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); + } + + /** + * @return the type of Weapon + */ + @Override + public WeaponType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + @Override + public boolean isWeapon() + { + return true; + } + + /** + * @return {@code true} if the weapon is magic, {@code false} otherwise. + */ + @Override + public boolean isMagicWeapon() + { + return _isMagicWeapon; + } + + /** + * @return the quantity of SoulShot used. + */ + public int getSoulShotCount() + { + return _soulShotCount; + } + + /** + * @return the quantity of SpiritShot used. + */ + public int getSpiritShotCount() + { + return _spiritShotCount; + } + + /** + * @return the reduced quantity of SoultShot used. + */ + public int getReducedSoulShot() + { + return _reducedSoulshot; + } + + /** + * @return the chance to use Reduced SoultShot. + */ + public int getReducedSoulShotChance() + { + return _reducedSoulshotChance; + } + + /** + * @return the MP consumption with the weapon. + */ + public int getMpConsume() + { + return _mpConsume; + } + + public int getBaseAttackRange() + { + return _baseAttackRange; + } + + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + + /** + * @return the reduced MP consumption with the weapon. + */ + public int getReducedMpConsume() + { + return _reducedMpConsume; + } + + /** + * @return the chance to use getReducedMpConsume() + */ + public int getReducedMpConsumeChance() + { + return _reducedMpConsumeChance; + } + + /** + * @return the Id in which weapon this weapon can be changed. + */ + public int getChangeWeaponId() + { + return _changeWeaponId; + } + + /** + * @return {@code true} if the weapon is force equip, {@code false} otherwise. + */ + public boolean isForceEquip() + { + return _isForceEquip; + } + + /** + * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. + */ + public boolean isAttackWeapon() + { + return _isAttackWeapon; + } + + /** + * @return {@code true} if the weapon is skills only, {@code false} otherwise. + */ + public boolean useWeaponSkillsOnly() + { + return _useWeaponSkillsOnly; + } + + /** + * @param caster the Creature pointing out the caster + * @param target the Creature pointing out the target + * @param trigger + * @param type + */ + public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) + { + forEachSkill(type, holder -> + { + final Skill skill = holder.getSkill(); + if (Rnd.get(100) >= holder.getChance()) + { + return; + } + + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // Trigger only if both are good or bad magic. + if (trigger.isBad() != skill.isBad()) + { + return; + } + + // No Trigger if not Magic Skill or is toggle + if (trigger.isMagic() != skill.isMagic()) + { + return; + } + + // No Trigger if skill is toggle + if (trigger.isToggle()) + { + return; + } + + if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) + { + return; + } + } + + // Skill condition not met + if (!skill.checkCondition(caster, target)) + { + return; + } + + skill.activateSkill(caster, target); + + // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // notify quests of a skill use + if (caster.isPlayer()) + { + World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); + } + if (caster.isPlayer()) + { + final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); + sm.addSkillName(skill); + caster.sendPacket(sm); + } + } + }); + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java new file mode 100644 index 0000000000..4736db96a7 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -0,0 +1,558 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.network.SystemMessageId; + +/** + * @author UnAfraid + */ +public class AppearanceStone +{ + private final int _id; + private final int _cost; + private final int _visualId; + private final long _lifeTime; + private final AppearanceType _type; + private final WeaponType _weaponType; + private final ArmorType _armorType; + private final AppearanceHandType _handType; + private final AppearanceMagicType _magicType; + private List _crystalTypes; + private List _targetTypes; + private List _bodyParts; + private List _races; + private List _racesNot; + private List _allVisualIds; + + public AppearanceStone(StatSet set) + { + _id = set.getInt("id"); + _visualId = set.getInt("visualId", 0); + _cost = set.getInt("cost", 0); + _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); + _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); + _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); + _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); + _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); + _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); + + final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); + if (targetType != AppearanceTargetType.NONE) + { + addTargetType(targetType); + } + + // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. + final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); + + // If no crystal type is defined, we must add all defaults. + if (crystalType == null) + { + switch (targetType) + { + case ACCESSORY: + case ALL: + { + addCrystalType(CrystalType.NONE); + // fallthrough + } + case WEAPON: + case ARMOR: + { + for (CrystalType cryType : CrystalType.values()) + { + if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) + { + addCrystalType(cryType); + } + } + } + } + } + else + { + addCrystalType(crystalType); + } + + final int bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); + if (bodyPart != ItemTemplate.SLOT_NONE) + { + addBodyPart(bodyPart); + } + + final Race race = set.getEnum("race", Race.class, Race.NONE); + if (race != Race.NONE) + { + addRace(race); + } + + final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); + if (raceNot != Race.NONE) + { + addRaceNot(raceNot); + } + } + + public int getId() + { + return _id; + } + + public int getVisualId() + { + return _visualId; + } + + public int getCost() + { + return _cost; + } + + public long getLifeTime() + { + return _lifeTime; + } + + public AppearanceType getType() + { + return _type; + } + + public WeaponType getWeaponType() + { + return _weaponType; + } + + public ArmorType getArmorType() + { + return _armorType; + } + + public AppearanceHandType getHandType() + { + return _handType; + } + + public AppearanceMagicType getMagicType() + { + return _magicType; + } + + public void addCrystalType(CrystalType type) + { + if (_crystalTypes == null) + { + _crystalTypes = new ArrayList<>(); + } + _crystalTypes.add(type); + } + + public List getCrystalTypes() + { + return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); + } + + public void addTargetType(AppearanceTargetType type) + { + if (_targetTypes == null) + { + _targetTypes = new ArrayList<>(); + } + _targetTypes.add(type); + } + + public List getTargetTypes() + { + return _targetTypes != null ? _targetTypes : Collections.emptyList(); + } + + public void addBodyPart(Integer part) + { + if (_bodyParts == null) + { + _bodyParts = new ArrayList<>(); + } + _bodyParts.add(part); + } + + public void addVisualId(AppearanceHolder appearanceHolder) + { + if (_allVisualIds == null) + { + _allVisualIds = new ArrayList<>(); + } + _allVisualIds.add(appearanceHolder); + } + + public List getVisualIds() + { + return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); + } + + public List getBodyParts() + { + return _bodyParts != null ? _bodyParts : Collections.emptyList(); + } + + public void addRace(Race race) + { + if (_races == null) + { + _races = new ArrayList<>(); + } + _races.add(race); + } + + public List getRaces() + { + return _races != null ? _races : Collections.emptyList(); + } + + public void addRaceNot(Race race) + { + if (_racesNot == null) + { + _racesNot = new ArrayList<>(); + } + _racesNot.add(race); + } + + public List getRacesNot() + { + return _racesNot != null ? _racesNot : Collections.emptyList(); + } + + /** + * @param player the actor requesting to use this appearance. + * @param targetItem the item to be modified with this appearance. + * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. + */ + public boolean checkConditions(Player player, Item targetItem) + { + if (targetItem == null) + { + return false; + } + + if (getTargetTypes().isEmpty()) + { + return false; + } + + if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); + return false; + } + + switch (_type) + { + case RESTORE: + { + if (targetItem.getVisualId() == 0) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); + return false; + } + + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + default: + { + // Seems like in retail item with already changed appearance, can be changed again without being restored. + + final AppearanceTargetType targetType = getTargetTypes().get(0); + switch (targetType) + { + case NONE: + { + return false; + } + case WEAPON: + { + if (!targetItem.isWeapon()) + { + player.sendPacket(SystemMessageId.WEAPONS_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ARMOR: + { + if (!targetItem.isArmor()) + { + player.sendPacket(SystemMessageId.ARMOR_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ACCESSORY: + { + if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + { + player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); + return false; + } + break; + } + case ALL: + { + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (findVisualChange(targetItem) == null) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + return true; + } + } + break; + } + } + + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (_weaponType != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) + { + if (_weaponType != WeaponType.CROSSBOW) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + } + + switch (_handType) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + } + + switch (_magicType) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + if (_armorType != ArmorType.NONE) + { + switch (_armorType) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + return true; + } + + public AppearanceHolder findVisualChange(Item targetItem) + { + for (AppearanceHolder holder : _allVisualIds) + { + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + { + continue; + } + + if (holder.getWeaponType() != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) + { + if (holder.getWeaponType() != WeaponType.CROSSBOW) + { + continue; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + continue; + } + } + + switch (holder.getHandType()) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + continue; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + continue; + } + break; + } + } + + switch (holder.getMagicType()) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + continue; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + continue; + } + } + } + } + + if (holder.getArmorType() != ArmorType.NONE) + { + switch (holder.getArmorType()) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + continue; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + continue; + } + } + } + } + return holder; + } + return null; + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java new file mode 100644 index 0000000000..6f73983c0e --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -0,0 +1,65 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import java.util.EnumMap; +import java.util.Map; + +import org.l2jmobius.gameserver.model.StatSet; + +/** + * @author UnAfraid + */ +public class CombinationItem +{ + private final int _itemOne; + private final int _itemTwo; + private final int _chance; + private final Map _rewards = new EnumMap<>(CombinationItemType.class); + + public CombinationItem(StatSet set) + { + _itemOne = set.getInt("one"); + _itemTwo = set.getInt("two"); + _chance = set.getInt("chance"); + } + + public int getItemOne() + { + return _itemOne; + } + + public int getItemTwo() + { + return _itemTwo; + } + + public int getChance() + { + return _chance; + } + + public void addReward(CombinationItemReward item) + { + _rewards.put(item.getType(), item); + } + + public CombinationItemReward getReward(CombinationItemType type) + { + return _rewards.get(type); + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java new file mode 100644 index 0000000000..8890655085 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -0,0 +1,210 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.logging.Logger; + +import org.l2jmobius.commons.util.CommonUtil; +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public abstract class AbstractEnchantItem +{ + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); + + private static final ItemType[] ENCHANT_TYPES = new ItemType[] + { + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + EtcItemType.BLESS_ENCHT_AM, + EtcItemType.BLESS_ENCHT_AM_DOWN, + EtcItemType.BLESS_ENCHT_WP, + EtcItemType.ENCHT_AM, + EtcItemType.ENCHT_WP, + EtcItemType.GIANT_ENCHT_AM, + EtcItemType.GIANT_ENCHT_WP, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + }; + + private final int _id; + private final CrystalType _grade; + private final int _minEnchantLevel; + private final int _maxEnchantLevel; + private final int _safeEnchantLevel; + private final int _randomEnchantMin; + private final int _randomEnchantMax; + private final double _bonusRate; + + public AbstractEnchantItem(StatSet set) + { + _id = set.getInt("id"); + if (getItem() == null) + { + throw new NullPointerException(); + } + else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) + { + throw new IllegalAccessError(); + } + _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); + _minEnchantLevel = set.getInt("minEnchant", 0); + _maxEnchantLevel = set.getInt("maxEnchant", 127); + _safeEnchantLevel = set.getInt("safeEnchant", 0); + _randomEnchantMin = set.getInt("randomEnchantMin", 1); + _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); + _bonusRate = set.getDouble("bonusRate", 0); + } + + /** + * @return id of current item + */ + public int getId() + { + return _id; + } + + /** + * @return bonus chance that would be added + */ + public double getBonusRate() + { + return _bonusRate; + } + + /** + * @return {@link ItemTemplate} current item/scroll + */ + public ItemTemplate getItem() + { + return ItemTable.getInstance().getTemplate(_id); + } + + /** + * @return grade of the item/scroll. + */ + public CrystalType getGrade() + { + return _grade; + } + + /** + * @return {@code true} if scroll is for weapon, {@code false} for armor + */ + public abstract boolean isWeapon(); + + /** + * @return the minimum enchant level that this scroll/item can be used with + */ + public int getMinEnchantLevel() + { + return _minEnchantLevel; + } + + /** + * @return the maximum enchant level that this scroll/item can be used with + */ + public int getMaxEnchantLevel() + { + return _maxEnchantLevel; + } + + /** + * @return the safe enchant level of this scroll/item + */ + public int getSafeEnchant() + { + return _safeEnchantLevel; + } + + /** + * @return the minimum random enchant level of this scroll/item + */ + public int getRandomEnchantMin() + { + return _randomEnchantMin; + } + + /** + * @return the maximum random enchant level of this scroll/item + */ + public int getRandomEnchantMax() + { + return _randomEnchantMax; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem + * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise + */ + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if (itemToEnchant == null) + { + return false; + } + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + { + return false; + } + else if (!isValidItemType(itemToEnchant.getItem().getType2())) + { + return false; + } + else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) + { + return false; + } + else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + { + return false; + } + return true; + } + + /** + * @param type2 + * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise + */ + private boolean isValidItemType(int type2) + { + if (type2 == ItemTemplate.TYPE2_WEAPON) + { + return isWeapon(); + } + else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) + { + return !isWeapon(); + } + return false; + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..6b234768e4 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private int _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(int slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 93% rename from L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index e2c2f6ad68..9a80e104b0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.stats.Stat; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java new file mode 100644 index 0000000000..bfe1c295da --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -0,0 +1,57 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public class EnchantSupportItem extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isGiant; + private final ItemType type; + + public EnchantSupportItem(StatSet set) + { + super(set); + type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + public boolean isBlessed() + { + return _isBlessed; + } + + public boolean isGiant() + { + return _isGiant; + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java index f891d3f3bc..4c2b67c766 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -69,14 +69,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent; import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java new file mode 100644 index 0000000000..c8a309674f --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -0,0 +1,88 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Crystal Type enumerated. + * @author Adry_85 + */ +public enum CrystalType +{ + NONE(0, 0, 0, 0), + D(1, 1458, 11, 90), + C(2, 1459, 6, 45), + B(3, 1460, 11, 67), + A(4, 1461, 20, 145), + S(5, 1462, 25, 250), + S80(6, 1462, 25, 250), + S84(7, 1462, 25, 250), + R(8, 17371, 30, 500), + R95(9, 17371, 30, 500), + R99(10, 17371, 30, 500), + EVENT(11, 0, 0, 0); + + private final int _level; + private final int _crystalId; + private final int _crystalEnchantBonusArmor; + private final int _crystalEnchantBonusWeapon; + + CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) + { + _level = level; + _crystalId = crystalId; + _crystalEnchantBonusArmor = crystalEnchantBonusArmor; + _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; + } + + /** + * Gets the crystal type ID. + * @return the crystal type ID + */ + public int getLevel() + { + return _level; + } + + /** + * Gets the item ID of the crystal. + * @return the item ID of the crystal + */ + public int getCrystalId() + { + return _crystalId; + } + + public int getCrystalEnchantBonusArmor() + { + return _crystalEnchantBonusArmor; + } + + public int getCrystalEnchantBonusWeapon() + { + return _crystalEnchantBonusWeapon; + } + + public boolean isGreater(CrystalType crystalType) + { + return getLevel() > crystalType.getLevel(); + } + + public boolean isLesser(CrystalType crystalType) + { + return getLevel() < crystalType.getLevel(); + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java new file mode 100644 index 0000000000..834b0c3996 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -0,0 +1,105 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * EtcItem Type enumerated. + */ +public enum EtcItemType implements ItemType +{ + NONE, + SCROLL, + ARROW, + POTION, + SPELLBOOK, + RECIPE, + MATERIAL, + PET_COLLAR, + CASTLE_GUARD, + DYE, + SEED, + SEED2, + HARVEST, + LOTTO, + RACE_TICKET, + TICKET_OF_LORD, + LURE, + CROP, + MATURECROP, + ENCHT_WP, + ENCHT_AM, + GIANT_ENCHT_WP, + GIANT_ENCHT_AM, + BLESS_ENCHT_WP, + BLESS_ENCHT_AM, + BLESS_ENCHT_AM_DOWN, + COUPON, + ELIXIR, + ENCHT_ATTR, + ENCHT_ATTR_CURSED, + BOLT, + ENCHT_ATTR_INC_PROP_ENCHT_WP, + ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_RUNE, + ENCHT_ATTRT_RUNE_SELECT, + TELEPORTBOOKMARK, + CHANGE_ATTR, + SOULSHOT, + SHAPE_SHIFTING_WP, + BLESS_SHAPE_SHIFTING_WP, + // EIT_RESTORE_SHAPE_SHIFTING_WP, + SHAPE_SHIFTING_WP_FIXED, + SHAPE_SHIFTING_AM, + BLESS_SHAPE_SHIFTING_AM, + SHAPE_SHIFTING_AM_FIXED, + SHAPE_SHIFTING_HAIRACC, + BLESS_SHAPE_SHIFTING_HAIRACC, + SHAPE_SHIFTING_HAIRACC_FIXED, + RESTORE_SHAPE_SHIFTING_WP, + RESTORE_SHAPE_SHIFTING_AM, + RESTORE_SHAPE_SHIFTING_HAIRACC, + RESTORE_SHAPE_SHIFTING_ALLITEM, + BLESS_INC_PROP_ENCHT_WP, + BLESS_INC_PROP_ENCHT_AM, + CARD_EVENT, + SHAPE_SHIFTING_ALLITEM_FIXED, + MULTI_ENCHT_WP, + MULTI_ENCHT_AM, + MULTI_INC_PROB_ENCHT_WP, + MULTI_INC_PROB_ENCHT_AM, + SOUL_CRYSTAL, + ENSOUL_STONE; + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return 0; + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 8323d4bdc7..06760564d7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index f4d1342b5f..4a4304845a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -51,14 +51,14 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 4052d539f3..8251a576c8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Armor.java deleted file mode 100644 index 6a27c29819..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Armor.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; - -/** - * This class is dedicated to the management of armors. - */ -public class Armor extends ItemTemplate -{ - private ArmorType _type; - - /** - * Constructor for Armor. - * @param set the StatSet designating the set of couples (key,value) characterizing the armor. - */ - public Armor(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); - - final int bodyPart = getBodyPart(); - if ((bodyPart == ItemTemplate.SLOT_NECK) || ((bodyPart & ItemTemplate.SLOT_L_EAR) != 0) || ((bodyPart & ItemTemplate.SLOT_L_FINGER) != 0) || ((bodyPart & ItemTemplate.SLOT_R_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_L_BRACELET) != 0)) - { - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_ACCESSORY; - } - else - { - if ((_type == ArmorType.NONE) && (getBodyPart() == ItemTemplate.SLOT_L_HAND)) - { - _type = ArmorType.SHIELD; - } - _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; - _type2 = ItemTemplate.TYPE2_SHIELD_ARMOR; - } - } - - /** - * @return the type of the armor. - */ - @Override - public ArmorType getItemType() - { - return _type; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise - */ - @Override - public boolean isArmor() - { - return true; - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java deleted file mode 100644 index d47f84330a..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ /dev/null @@ -1,300 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.Collection; -import java.util.Objects; - -import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * This class contains Item
- * Use to sort Item of : - *
    - *
  • Armor
    • - *
  • EtcItem
    • - *
  • Weapon
    • - *
- * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ - */ -public class WarehouseItem -{ - private final ItemTemplate _item; - private final int _object; - private final long _count; - private final int _owner; - private final int _locationSlot; - private final int _enchant; - private final CrystalType _grade; - private final VariationInstance _augmentation; - private final int _customType1; - private final int _customType2; - private final int _mana; - - private byte _elemAtkType = -2; - private int _elemAtkPower = 0; - - private final int[] _elemDefAttr = - { - 0, - 0, - 0, - 0, - 0, - 0 - }; - - private final int[] _enchantOptions; - private final Collection _soulCrystalOptions; - private final Collection _soulCrystalSpecialOptions; - - private final int _time; - - public WarehouseItem(Item item) - { - Objects.requireNonNull(item); - _item = item.getItem(); - _object = item.getObjectId(); - _count = item.getCount(); - _owner = item.getOwnerId(); - _locationSlot = item.getLocationSlot(); - _enchant = item.getEnchantLevel(); - _customType1 = item.getCustomType1(); - _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); - _augmentation = item.getAugmentation(); - _mana = item.getMana(); - _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; - _elemAtkType = item.getAttackAttributeType().getClientId(); - _elemAtkPower = item.getAttackAttributePower(); - for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) - { - _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); - } - _enchantOptions = item.getEnchantOptions(); - _soulCrystalOptions = item.getSpecialAbilities(); - _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); - } - - /** - * @return the item. - */ - public ItemTemplate getItem() - { - return _item; - } - - /** - * @return the unique objectId. - */ - public int getObjectId() - { - return _object; - } - - /** - * @return the owner. - */ - public int getOwnerId() - { - return _owner; - } - - /** - * @return the location slot. - */ - public int getLocationSlot() - { - return _locationSlot; - } - - /** - * @return the count. - */ - public long getCount() - { - return _count; - } - - /** - * @return the first type. - */ - public int getType1() - { - return _item.getType1(); - } - - /** - * @return the second type. - */ - public int getType2() - { - return _item.getType2(); - } - - /** - * @return the second type. - */ - public ItemType getItemType() - { - return _item.getItemType(); - } - - /** - * @return the ItemId. - */ - public int getItemId() - { - return _item.getId(); - } - - /** - * @return the part of body used with this item. - */ - public int getBodyPart() - { - return _item.getBodyPart(); - } - - /** - * @return the enchant level. - */ - public int getEnchantLevel() - { - return _enchant; - } - - /** - * @return the item grade - */ - public CrystalType getItemGrade() - { - return _grade; - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - public boolean isWeapon() - { - return (_item instanceof Weapon); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise. - */ - public boolean isArmor() - { - return (_item instanceof Armor); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - public boolean isEtcItem() - { - return (_item instanceof EtcItem); - } - - /** - * @return the name of the item - */ - public String getItemName() - { - return _item.getName(); - } - - /** - * @return the augmentation If. - */ - public VariationInstance getAugmentation() - { - return _augmentation; - } - - /** - * @return the name of the item - */ - public String getName() - { - return _item.getName(); - } - - public int getCustomType1() - { - return _customType1; - } - - public int getCustomType2() - { - return _customType2; - } - - public int getMana() - { - return _mana; - } - - public byte getAttackElementType() - { - return _elemAtkType; - } - - public int getAttackElementPower() - { - return _elemAtkPower; - } - - public int getElementDefAttr(byte i) - { - return _elemDefAttr[i]; - } - - public int[] getEnchantOptions() - { - return _enchantOptions; - } - - public Collection getSoulCrystalOptions() - { - return _soulCrystalOptions; - } - - public Collection getSoulCrystalSpecialOptions() - { - return _soulCrystalSpecialOptions; - } - - public int getTime() - { - return _time; - } - - /** - * @return the name of the item - */ - @Override - public String toString() - { - return _item.toString(); - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Weapon.java deleted file mode 100644 index 85bb22d23b..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is dedicated to the management of weapons. - */ -public class Weapon extends ItemTemplate -{ - private WeaponType _type; - private boolean _isMagicWeapon; - private int _soulShotCount; - private int _spiritShotCount; - private int _mpConsume; - private int _baseAttackRange; - private int _baseAttackRadius; - private int _baseAttackAngle; - private int _changeWeaponId; - - private int _reducedSoulshot; - private int _reducedSoulshotChance; - - private int _reducedMpConsume; - private int _reducedMpConsumeChance; - - private boolean _isForceEquip; - private boolean _isAttackWeapon; - private boolean _useWeaponSkillsOnly; - - /** - * Constructor for Weapon. - * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. - */ - public Weapon(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_WEAPON; - _isMagicWeapon = set.getBoolean("is_magic_weapon", false); - _soulShotCount = set.getInt("soulshots", 0); - _spiritShotCount = set.getInt("spiritshots", 0); - _mpConsume = set.getInt("mp_consume", 0); - _baseAttackRange = set.getInt("attack_range", 40); - final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) - { - _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); - } - else - { - _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 - } - - final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); - _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; - _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; - - final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); - _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; - _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; - _changeWeaponId = set.getInt("change_weaponId", 0); - _isForceEquip = set.getBoolean("isForceEquip", false); - _isAttackWeapon = set.getBoolean("isAttackWeapon", true); - _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); - } - - /** - * @return the type of Weapon - */ - @Override - public WeaponType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - @Override - public boolean isWeapon() - { - return true; - } - - /** - * @return {@code true} if the weapon is magic, {@code false} otherwise. - */ - @Override - public boolean isMagicWeapon() - { - return _isMagicWeapon; - } - - /** - * @return the quantity of SoulShot used. - */ - public int getSoulShotCount() - { - return _soulShotCount; - } - - /** - * @return the quantity of SpiritShot used. - */ - public int getSpiritShotCount() - { - return _spiritShotCount; - } - - /** - * @return the reduced quantity of SoultShot used. - */ - public int getReducedSoulShot() - { - return _reducedSoulshot; - } - - /** - * @return the chance to use Reduced SoultShot. - */ - public int getReducedSoulShotChance() - { - return _reducedSoulshotChance; - } - - /** - * @return the MP consumption with the weapon. - */ - public int getMpConsume() - { - return _mpConsume; - } - - public int getBaseAttackRange() - { - return _baseAttackRange; - } - - public int getBaseAttackRadius() - { - return _baseAttackRadius; - } - - public int getBaseAttackAngle() - { - return _baseAttackAngle; - } - - /** - * @return the reduced MP consumption with the weapon. - */ - public int getReducedMpConsume() - { - return _reducedMpConsume; - } - - /** - * @return the chance to use getReducedMpConsume() - */ - public int getReducedMpConsumeChance() - { - return _reducedMpConsumeChance; - } - - /** - * @return the Id in which weapon this weapon can be changed. - */ - public int getChangeWeaponId() - { - return _changeWeaponId; - } - - /** - * @return {@code true} if the weapon is force equip, {@code false} otherwise. - */ - public boolean isForceEquip() - { - return _isForceEquip; - } - - /** - * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. - */ - public boolean isAttackWeapon() - { - return _isAttackWeapon; - } - - /** - * @return {@code true} if the weapon is skills only, {@code false} otherwise. - */ - public boolean useWeaponSkillsOnly() - { - return _useWeaponSkillsOnly; - } - - /** - * @param caster the Creature pointing out the caster - * @param target the Creature pointing out the target - * @param trigger - * @param type - */ - public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) - { - forEachSkill(type, holder -> - { - final Skill skill = holder.getSkill(); - if (Rnd.get(100) >= holder.getChance()) - { - return; - } - - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // Trigger only if both are good or bad magic. - if (trigger.isBad() != skill.isBad()) - { - return; - } - - // No Trigger if not Magic Skill or is toggle - if (trigger.isMagic() != skill.isMagic()) - { - return; - } - - // No Trigger if skill is toggle - if (trigger.isToggle()) - { - return; - } - - if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) - { - return; - } - } - - // Skill condition not met - if (!skill.checkCondition(caster, target)) - { - return; - } - - skill.activateSkill(caster, target); - - // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // notify quests of a skill use - if (caster.isPlayer()) - { - World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); - } - if (caster.isPlayer()) - { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); - sm.addSkillName(skill); - caster.sendPacket(sm); - } - } - }); - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java deleted file mode 100644 index aafdba599e..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ /dev/null @@ -1,558 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author UnAfraid - */ -public class AppearanceStone -{ - private final int _id; - private final int _cost; - private final int _visualId; - private final long _lifeTime; - private final AppearanceType _type; - private final WeaponType _weaponType; - private final ArmorType _armorType; - private final AppearanceHandType _handType; - private final AppearanceMagicType _magicType; - private List _crystalTypes; - private List _targetTypes; - private List _bodyParts; - private List _races; - private List _racesNot; - private List _allVisualIds; - - public AppearanceStone(StatSet set) - { - _id = set.getInt("id"); - _visualId = set.getInt("visualId", 0); - _cost = set.getInt("cost", 0); - _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); - _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); - _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); - _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); - _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); - _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); - - final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); - if (targetType != AppearanceTargetType.NONE) - { - addTargetType(targetType); - } - - // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. - final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); - - // If no crystal type is defined, we must add all defaults. - if (crystalType == null) - { - switch (targetType) - { - case ACCESSORY: - case ALL: - { - addCrystalType(CrystalType.NONE); - // fallthrough - } - case WEAPON: - case ARMOR: - { - for (CrystalType cryType : CrystalType.values()) - { - if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) - { - addCrystalType(cryType); - } - } - } - } - } - else - { - addCrystalType(crystalType); - } - - final int bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); - if (bodyPart != ItemTemplate.SLOT_NONE) - { - addBodyPart(bodyPart); - } - - final Race race = set.getEnum("race", Race.class, Race.NONE); - if (race != Race.NONE) - { - addRace(race); - } - - final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); - if (raceNot != Race.NONE) - { - addRaceNot(raceNot); - } - } - - public int getId() - { - return _id; - } - - public int getVisualId() - { - return _visualId; - } - - public int getCost() - { - return _cost; - } - - public long getLifeTime() - { - return _lifeTime; - } - - public AppearanceType getType() - { - return _type; - } - - public WeaponType getWeaponType() - { - return _weaponType; - } - - public ArmorType getArmorType() - { - return _armorType; - } - - public AppearanceHandType getHandType() - { - return _handType; - } - - public AppearanceMagicType getMagicType() - { - return _magicType; - } - - public void addCrystalType(CrystalType type) - { - if (_crystalTypes == null) - { - _crystalTypes = new ArrayList<>(); - } - _crystalTypes.add(type); - } - - public List getCrystalTypes() - { - return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); - } - - public void addTargetType(AppearanceTargetType type) - { - if (_targetTypes == null) - { - _targetTypes = new ArrayList<>(); - } - _targetTypes.add(type); - } - - public List getTargetTypes() - { - return _targetTypes != null ? _targetTypes : Collections.emptyList(); - } - - public void addBodyPart(Integer part) - { - if (_bodyParts == null) - { - _bodyParts = new ArrayList<>(); - } - _bodyParts.add(part); - } - - public void addVisualId(AppearanceHolder appearanceHolder) - { - if (_allVisualIds == null) - { - _allVisualIds = new ArrayList<>(); - } - _allVisualIds.add(appearanceHolder); - } - - public List getVisualIds() - { - return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); - } - - public List getBodyParts() - { - return _bodyParts != null ? _bodyParts : Collections.emptyList(); - } - - public void addRace(Race race) - { - if (_races == null) - { - _races = new ArrayList<>(); - } - _races.add(race); - } - - public List getRaces() - { - return _races != null ? _races : Collections.emptyList(); - } - - public void addRaceNot(Race race) - { - if (_racesNot == null) - { - _racesNot = new ArrayList<>(); - } - _racesNot.add(race); - } - - public List getRacesNot() - { - return _racesNot != null ? _racesNot : Collections.emptyList(); - } - - /** - * @param player the actor requesting to use this appearance. - * @param targetItem the item to be modified with this appearance. - * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. - */ - public boolean checkConditions(Player player, Item targetItem) - { - if (targetItem == null) - { - return false; - } - - if (getTargetTypes().isEmpty()) - { - return false; - } - - if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); - return false; - } - - switch (_type) - { - case RESTORE: - { - if (targetItem.getVisualId() == 0) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); - return false; - } - - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - default: - { - // Seems like in retail item with already changed appearance, can be changed again without being restored. - - final AppearanceTargetType targetType = getTargetTypes().get(0); - switch (targetType) - { - case NONE: - { - return false; - } - case WEAPON: - { - if (!targetItem.isWeapon()) - { - player.sendPacket(SystemMessageId.WEAPONS_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ARMOR: - { - if (!targetItem.isArmor()) - { - player.sendPacket(SystemMessageId.ARMOR_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ACCESSORY: - { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) - { - player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); - return false; - } - break; - } - case ALL: - { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (findVisualChange(targetItem) == null) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - return true; - } - } - break; - } - } - - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (_weaponType != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) - { - if (_weaponType != WeaponType.CROSSBOW) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - } - - switch (_handType) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - } - - switch (_magicType) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - if (_armorType != ArmorType.NONE) - { - switch (_armorType) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - return true; - } - - public AppearanceHolder findVisualChange(Item targetItem) - { - for (AppearanceHolder holder : _allVisualIds) - { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) - { - continue; - } - - if (holder.getWeaponType() != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) - { - if (holder.getWeaponType() != WeaponType.CROSSBOW) - { - continue; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - continue; - } - } - - switch (holder.getHandType()) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - continue; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - continue; - } - break; - } - } - - switch (holder.getMagicType()) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - continue; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - continue; - } - } - } - } - - if (holder.getArmorType() != ArmorType.NONE) - { - switch (holder.getArmorType()) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - continue; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - continue; - } - } - } - } - return holder; - } - return null; - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java deleted file mode 100644 index a2897ba911..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import java.util.EnumMap; -import java.util.Map; - -import org.l2jmobius.gameserver.model.StatSet; - -/** - * @author UnAfraid - */ -public class CombinationItem -{ - private final int _itemOne; - private final int _itemTwo; - private final int _chance; - private final Map _rewards = new EnumMap<>(CombinationItemType.class); - - public CombinationItem(StatSet set) - { - _itemOne = set.getInt("one"); - _itemTwo = set.getInt("two"); - _chance = set.getInt("chance"); - } - - public int getItemOne() - { - return _itemOne; - } - - public int getItemTwo() - { - return _itemTwo; - } - - public int getChance() - { - return _chance; - } - - public void addReward(CombinationItemReward item) - { - _rewards.put(item.getType(), item); - } - - public CombinationItemReward getReward(CombinationItemType type) - { - return _rewards.get(type); - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java deleted file mode 100644 index a09b01d571..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.logging.Logger; - -import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public abstract class AbstractEnchantItem -{ - protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); - - private static final ItemType[] ENCHANT_TYPES = new ItemType[] - { - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - EtcItemType.BLESS_ENCHT_AM, - EtcItemType.BLESS_ENCHT_AM_DOWN, - EtcItemType.BLESS_ENCHT_WP, - EtcItemType.ENCHT_AM, - EtcItemType.ENCHT_WP, - EtcItemType.GIANT_ENCHT_AM, - EtcItemType.GIANT_ENCHT_WP, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - }; - - private final int _id; - private final CrystalType _grade; - private final int _minEnchantLevel; - private final int _maxEnchantLevel; - private final int _safeEnchantLevel; - private final int _randomEnchantMin; - private final int _randomEnchantMax; - private final double _bonusRate; - - public AbstractEnchantItem(StatSet set) - { - _id = set.getInt("id"); - if (getItem() == null) - { - throw new NullPointerException(); - } - else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) - { - throw new IllegalAccessError(); - } - _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); - _minEnchantLevel = set.getInt("minEnchant", 0); - _maxEnchantLevel = set.getInt("maxEnchant", 127); - _safeEnchantLevel = set.getInt("safeEnchant", 0); - _randomEnchantMin = set.getInt("randomEnchantMin", 1); - _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); - _bonusRate = set.getDouble("bonusRate", 0); - } - - /** - * @return id of current item - */ - public int getId() - { - return _id; - } - - /** - * @return bonus chance that would be added - */ - public double getBonusRate() - { - return _bonusRate; - } - - /** - * @return {@link ItemTemplate} current item/scroll - */ - public ItemTemplate getItem() - { - return ItemTable.getInstance().getTemplate(_id); - } - - /** - * @return grade of the item/scroll. - */ - public CrystalType getGrade() - { - return _grade; - } - - /** - * @return {@code true} if scroll is for weapon, {@code false} for armor - */ - public abstract boolean isWeapon(); - - /** - * @return the minimum enchant level that this scroll/item can be used with - */ - public int getMinEnchantLevel() - { - return _minEnchantLevel; - } - - /** - * @return the maximum enchant level that this scroll/item can be used with - */ - public int getMaxEnchantLevel() - { - return _maxEnchantLevel; - } - - /** - * @return the safe enchant level of this scroll/item - */ - public int getSafeEnchant() - { - return _safeEnchantLevel; - } - - /** - * @return the minimum random enchant level of this scroll/item - */ - public int getRandomEnchantMin() - { - return _randomEnchantMin; - } - - /** - * @return the maximum random enchant level of this scroll/item - */ - public int getRandomEnchantMax() - { - return _randomEnchantMax; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem - * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise - */ - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if (itemToEnchant == null) - { - return false; - } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) - { - return false; - } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) - { - return false; - } - else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) - { - return false; - } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) - { - return false; - } - return true; - } - - /** - * @param type2 - * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise - */ - private boolean isValidItemType(int type2) - { - if (type2 == ItemTemplate.TYPE2_WEAPON) - { - return isWeapon(); - } - else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) - { - return !isWeapon(); - } - return false; - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fb23338d90..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private int _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(int slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java deleted file mode 100644 index 13d6b5a2ee..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public class EnchantSupportItem extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isGiant; - private final ItemType type; - - public EnchantSupportItem(StatSet set) - { - super(set); - type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - public boolean isBlessed() - { - return _isBlessed; - } - - public boolean isGiant() - { - return _isGiant; - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java deleted file mode 100644 index d059efd025..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Crystal Type enumerated. - * @author Adry_85 - */ -public enum CrystalType -{ - NONE(0, 0, 0, 0), - D(1, 1458, 11, 90), - C(2, 1459, 6, 45), - B(3, 1460, 11, 67), - A(4, 1461, 20, 145), - S(5, 1462, 25, 250), - S80(6, 1462, 25, 250), - S84(7, 1462, 25, 250), - R(8, 17371, 30, 500), - R95(9, 17371, 30, 500), - R99(10, 17371, 30, 500), - EVENT(11, 0, 0, 0); - - private final int _level; - private final int _crystalId; - private final int _crystalEnchantBonusArmor; - private final int _crystalEnchantBonusWeapon; - - CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) - { - _level = level; - _crystalId = crystalId; - _crystalEnchantBonusArmor = crystalEnchantBonusArmor; - _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; - } - - /** - * Gets the crystal type ID. - * @return the crystal type ID - */ - public int getLevel() - { - return _level; - } - - /** - * Gets the item ID of the crystal. - * @return the item ID of the crystal - */ - public int getCrystalId() - { - return _crystalId; - } - - public int getCrystalEnchantBonusArmor() - { - return _crystalEnchantBonusArmor; - } - - public int getCrystalEnchantBonusWeapon() - { - return _crystalEnchantBonusWeapon; - } - - public boolean isGreater(CrystalType crystalType) - { - return getLevel() > crystalType.getLevel(); - } - - public boolean isLesser(CrystalType crystalType) - { - return getLevel() < crystalType.getLevel(); - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java deleted file mode 100644 index b352bd7fc0..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * EtcItem Type enumerated. - */ -public enum EtcItemType implements ItemType -{ - NONE, - SCROLL, - ARROW, - POTION, - SPELLBOOK, - RECIPE, - MATERIAL, - PET_COLLAR, - CASTLE_GUARD, - DYE, - SEED, - SEED2, - HARVEST, - LOTTO, - RACE_TICKET, - TICKET_OF_LORD, - LURE, - CROP, - MATURECROP, - ENCHT_WP, - ENCHT_AM, - GIANT_ENCHT_WP, - GIANT_ENCHT_AM, - BLESS_ENCHT_WP, - BLESS_ENCHT_AM, - BLESS_ENCHT_AM_DOWN, - COUPON, - ELIXIR, - ENCHT_ATTR, - ENCHT_ATTR_CURSED, - BOLT, - ENCHT_ATTR_INC_PROP_ENCHT_WP, - ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_RUNE, - ENCHT_ATTRT_RUNE_SELECT, - TELEPORTBOOKMARK, - CHANGE_ATTR, - SOULSHOT, - SHAPE_SHIFTING_WP, - BLESS_SHAPE_SHIFTING_WP, - // EIT_RESTORE_SHAPE_SHIFTING_WP, - SHAPE_SHIFTING_WP_FIXED, - SHAPE_SHIFTING_AM, - BLESS_SHAPE_SHIFTING_AM, - SHAPE_SHIFTING_AM_FIXED, - SHAPE_SHIFTING_HAIRACC, - BLESS_SHAPE_SHIFTING_HAIRACC, - SHAPE_SHIFTING_HAIRACC_FIXED, - RESTORE_SHAPE_SHIFTING_WP, - RESTORE_SHAPE_SHIFTING_AM, - RESTORE_SHAPE_SHIFTING_HAIRACC, - RESTORE_SHAPE_SHIFTING_ALLITEM, - BLESS_INC_PROP_ENCHT_WP, - BLESS_INC_PROP_ENCHT_AM, - CARD_EVENT, - SHAPE_SHIFTING_ALLITEM_FIXED, - MULTI_ENCHT_WP, - MULTI_ENCHT_AM, - MULTI_INC_PROB_ENCHT_WP, - MULTI_INC_PROB_ENCHT_AM, - SOUL_CRYSTAL, - ENSOUL_STONE; - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return 0; - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c807e1298e..0fcb8c33e4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 5bf10abc0f..7929fbbe60 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java index 7d30237cb1..d9c41811d2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java index 80eec709d8..1e18bcb9ad 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 527e0b0938..f93380fc15 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 777ba0c3c7..ba26674462 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 7d1dab62cf..28d35439a8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 98ad03f40d..5e9d4175d5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 38a7116383..ff0ad75b8a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 043806dfb4..d8f3930287 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 1839afb5ce..334fb9252a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 7109a54ed1..5df6b208a3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index 165f9b4668..80e30184ff 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index df3acc3df1..7c51b0ad38 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index bab0af38a8..1c31ff4a11 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index f467c9e4c3..e25524223a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 1753cb4ba3..370cd50883 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index dc02d363c8..ea86074f0e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 543774b24c..e1c584d405 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 8e4db9d92c..a7e3f28ed6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 9dfcf81ebd..5d4b260a76 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 85dbfd4647..ed78abf81d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index eee07594d3..c67449efed 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 48a67946e9..3ee4350b8d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index ede2fd556c..b79b9196fa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 21dcd2d13d..9565b3e5ca 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 6b1a6a94e8..1b20e2e248 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 96d170857a..2330851024 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 7e7abde686..66fb839f0e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index ce98ab493d..d0add3fa49 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 595da81538..ab9f0c33f7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 945ff531e4..b9c3900403 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 8626434905..e4376f9ad5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index d92fbb028a..26cfaf9835 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d498c232c5..d66024cc52 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 13b2d241e5..33a10fd20c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index fb025563e6..d7d4d2b449 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 60cfa6b927..6d1eea218a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 4c5880c23a..ee93527570 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 6bc227a559..3de872e222 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 4d836680da..0bf083a345 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index b1f9daa6ca..b42c56a13c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 81e3a8f4c9..7e89bd6ed3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index e7a8e8baf6..7fbd7ebecb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 56cf3b84cc..b9a7aadbf7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 59c63fceca..acee799091 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index a4f0ecaefb..d5690408da 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51f689b277..8b40712b46 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index a80a619158..9964cd1f64 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 3ec3d494e8..db168592f1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 942a5f1cdc..b739a94c55 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 235c3abacf..29d5eafeef 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c9e5eabc7..ef1d37297e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index a8903175db..f212539af7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index b690bd9455..c14caa76e0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 312fd10338..9ab9f0a836 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 6d0df16c27..0e6e64c7b2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 61a01d067c..658087380a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 84bc5a6eba..3800940bac 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 62efb91d9e..a79c0f59f2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index e744eecbdd..8735b315b6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index a5616075a6..e1da19cc8f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index faf957b0c9..d499719f31 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index f27cf60885..bb462b6cd2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index d8f88333df..df50db952f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index d48b66c6ef..9d9b24a54f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 84ee2d06c6..470ce757db 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index bcc376c327..455305ce79 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index fcc27f821d..64fb395dda 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 1cf1f17260..876a24c7ad 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java index 3c87faec44..f61481565a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.vip; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/DocumentBase.java index 65e18e4a0e..bcbe96ad19 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -134,9 +137,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/SiegeGuards.java index 8ac4fe72af..c9ca7df743 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index fa45b28c67..42d382f269 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index dd4215411e..a8e6c06eed 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 418ed93b2a..4081019df2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 5b1db54836..e7113941ec 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index f73f3c2e73..5d3caadfd5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 6a67c2d642..2e5b2846bf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index dd5c2f593d..2ea2bf9f11 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 4e5a8d7aaf..1950403a0d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d5d2ad10cf..8f4db5d580 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 24d5d75b7a..704f15e5ba 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index a403724d9a..10d1c9e03b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2b6db19588..607dc3b8f5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 437b502a95..b8985f0fef 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 6e7baf8033..b02e2fa787 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index 1866a34d94..b7c74b3b74 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 7f55fdc9ed..7e0edf65b8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 28b0f453fc..5c2f25e7f2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 2ed9c1c346..7f5e0e87a1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index ebbd33bda0..f952b58fa2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 189a2f7e73..714a195ccb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 7d2f4894c6..770b66ee92 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 02468039cf..742f98e38b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 742ca00283..3d97c9ac22 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 3eb4d77710..8b4d315b50 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index a88c6c50c5..0aa5cb3e1f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6f313482ab..54230f39a1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b4ea6e761f..bfc5324c4d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 410e71cff8..01714d7f5a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VipUp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VipUp.java index 9cf1267bbb..f716953da2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VipUp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VipUp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index ecb73b365e..30e5fd51af 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 80351144d6..44599b2555 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 2472a2d955..85d614b478 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index d1d5c8c332..c2610ec4e3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index abf3b47d43..d0c1cf040c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 3ae04b22f4..c32e1327ea 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index a02dc34079..8167aa1eef 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 02629d5d34..e17c4d3c90 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27f0904f0f..a61cc1bd71 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 255f805e72..12f575b243 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index 3988e77104..587f809dc9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 77b9a03185..c0d47bc8de 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java index 4e5984b292..efde71ba49 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java index e70725593d..954c6b4142 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java index a3a6734f90..13e468df91 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.QuestSoundHtmlHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java index d29aaf54b5..7773083c9a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java index cb732dea8c..bd13a4bbe9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java index 00920614ce..0d21264633 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java index bb78cafa1c..670e0a7192 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/ItemTable.java index 71e95065ef..4c3a4ba842 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index 313709ab07..4b2cf3b555 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 99e8b8b3d2..1c3099e6c4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index d134fe859e..c57e62c683 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index e131a0f0e5..3359c09da3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 07af46b4a4..339a7e047c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index 35abdf9c02..a6f2465447 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 0f7be781b2..7bc7be8487 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index ba3ab89b07..20d23bc7fc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 03cb8145be..5cba56b98c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -35,9 +35,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 3d21c7ddf0..5f3eb28e8a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ArmorSet.java index 4d11cf0970..a84709e2db 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/CombatFlag.java index 391b02eefb..833b9a4a6c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 142e7874c0..31885961ce 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java index ec67ca4a4a..5244307c22 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java @@ -45,8 +45,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ShortCuts.java index a9796fbbb7..36f3461010 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TradeList.java index bbafcb1416..bea714862c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 0c61840a56..eeb8cce2c1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java index e46fafb040..836c5f4bd4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java index 87dbc92199..2aa4bc7349 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java index 9664ed08f3..a3cfb37b31 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -227,22 +227,22 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Summon.java index 738d1de7f1..7210a7fbcb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 2dd9a62da6..ed26029abd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b621ac99a1..b2b77ee360 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index 99060558ba..4552b070ca 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 6dcfa2c687..c417781b11 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 29208b2b65..8e5328b099 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index ee48777edd..70233cec08 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.vip.VipManager; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9f908898ea..ebdbe02899 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index d60e1343b9..1f55ed1bae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 2e75866e00..0b472089a8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index fcd8e14da5..2613a1847b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index bab8b12ab1..9f4fdbdfc9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index a5fea7c6f6..347f281026 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index dc2add2a3a..8c8b2b019d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -130,15 +130,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index 92bce4268b..14cccac24d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 79c69f739d..41f554b9e0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index 574e07a8e7..a6b878697e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/Armor.java index 72b1f27d0b..58945b9cee 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/Henna.java similarity index 94% rename from L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Henna.java rename to L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/Henna.java index 09fdb7abcb..d029309b0f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.HashMap; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index 4d1fcf4535..0e67609bcb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java new file mode 100644 index 0000000000..b289fa70ae --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -0,0 +1,300 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.Collection; +import java.util.Objects; + +import org.l2jmobius.gameserver.enums.AttributeType; +import org.l2jmobius.gameserver.model.VariationInstance; +import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * This class contains Item
+ * Use to sort Item of : + *
    + *
  • Armor
    • + *
  • EtcItem
    • + *
  • Weapon
    • + *
+ * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ + */ +public class WarehouseItem +{ + private final ItemTemplate _item; + private final int _object; + private final long _count; + private final int _owner; + private final int _locationSlot; + private final int _enchant; + private final CrystalType _grade; + private final VariationInstance _augmentation; + private final int _customType1; + private final int _customType2; + private final int _mana; + + private byte _elemAtkType = -2; + private int _elemAtkPower = 0; + + private final int[] _elemDefAttr = + { + 0, + 0, + 0, + 0, + 0, + 0 + }; + + private final int[] _enchantOptions; + private final Collection _soulCrystalOptions; + private final Collection _soulCrystalSpecialOptions; + + private final int _time; + + public WarehouseItem(Item item) + { + Objects.requireNonNull(item); + _item = item.getItem(); + _object = item.getObjectId(); + _count = item.getCount(); + _owner = item.getOwnerId(); + _locationSlot = item.getLocationSlot(); + _enchant = item.getEnchantLevel(); + _customType1 = item.getCustomType1(); + _customType2 = item.getCustomType2(); + _grade = item.getItem().getCrystalType(); + _augmentation = item.getAugmentation(); + _mana = item.getMana(); + _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; + _elemAtkType = item.getAttackAttributeType().getClientId(); + _elemAtkPower = item.getAttackAttributePower(); + for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) + { + _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); + } + _enchantOptions = item.getEnchantOptions(); + _soulCrystalOptions = item.getSpecialAbilities(); + _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); + } + + /** + * @return the item. + */ + public ItemTemplate getItem() + { + return _item; + } + + /** + * @return the unique objectId. + */ + public int getObjectId() + { + return _object; + } + + /** + * @return the owner. + */ + public int getOwnerId() + { + return _owner; + } + + /** + * @return the location slot. + */ + public int getLocationSlot() + { + return _locationSlot; + } + + /** + * @return the count. + */ + public long getCount() + { + return _count; + } + + /** + * @return the first type. + */ + public int getType1() + { + return _item.getType1(); + } + + /** + * @return the second type. + */ + public int getType2() + { + return _item.getType2(); + } + + /** + * @return the second type. + */ + public ItemType getItemType() + { + return _item.getItemType(); + } + + /** + * @return the ItemId. + */ + public int getItemId() + { + return _item.getId(); + } + + /** + * @return the part of body used with this item. + */ + public long getBodyPart() + { + return _item.getBodyPart(); + } + + /** + * @return the enchant level. + */ + public int getEnchantLevel() + { + return _enchant; + } + + /** + * @return the item grade + */ + public CrystalType getItemGrade() + { + return _grade; + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + public boolean isWeapon() + { + return (_item instanceof Weapon); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise. + */ + public boolean isArmor() + { + return (_item instanceof Armor); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + public boolean isEtcItem() + { + return (_item instanceof EtcItem); + } + + /** + * @return the name of the item + */ + public String getItemName() + { + return _item.getName(); + } + + /** + * @return the augmentation If. + */ + public VariationInstance getAugmentation() + { + return _augmentation; + } + + /** + * @return the name of the item + */ + public String getName() + { + return _item.getName(); + } + + public int getCustomType1() + { + return _customType1; + } + + public int getCustomType2() + { + return _customType2; + } + + public int getMana() + { + return _mana; + } + + public byte getAttackElementType() + { + return _elemAtkType; + } + + public int getAttackElementPower() + { + return _elemAtkPower; + } + + public int getElementDefAttr(byte i) + { + return _elemDefAttr[i]; + } + + public int[] getEnchantOptions() + { + return _enchantOptions; + } + + public Collection getSoulCrystalOptions() + { + return _soulCrystalOptions; + } + + public Collection getSoulCrystalSpecialOptions() + { + return _soulCrystalSpecialOptions; + } + + public int getTime() + { + return _time; + } + + /** + * @return the name of the item + */ + @Override + public String toString() + { + return _item.toString(); + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/Weapon.java new file mode 100644 index 0000000000..3ae599da0d --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -0,0 +1,311 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.enums.ItemSkillType; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is dedicated to the management of weapons. + */ +public class Weapon extends ItemTemplate +{ + private WeaponType _type; + private boolean _isMagicWeapon; + private int _soulShotCount; + private int _spiritShotCount; + private int _mpConsume; + private int _baseAttackRange; + private int _baseAttackRadius; + private int _baseAttackAngle; + private int _changeWeaponId; + + private int _reducedSoulshot; + private int _reducedSoulshotChance; + + private int _reducedMpConsume; + private int _reducedMpConsumeChance; + + private boolean _isForceEquip; + private boolean _isAttackWeapon; + private boolean _useWeaponSkillsOnly; + + /** + * Constructor for Weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. + */ + public Weapon(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_WEAPON; + _isMagicWeapon = set.getBoolean("is_magic_weapon", false); + _soulShotCount = set.getInt("soulshots", 0); + _spiritShotCount = set.getInt("spiritshots", 0); + _mpConsume = set.getInt("mp_consume", 0); + _baseAttackRange = set.getInt("attack_range", 40); + final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) + { + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + } + else + { + _baseAttackRadius = 40; + _baseAttackAngle = 240; // 360 - 120 + } + + final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); + _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; + _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; + + final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); + _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; + _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; + _changeWeaponId = set.getInt("change_weaponId", 0); + _isForceEquip = set.getBoolean("isForceEquip", false); + _isAttackWeapon = set.getBoolean("isAttackWeapon", true); + _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); + } + + /** + * @return the type of Weapon + */ + @Override + public WeaponType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + @Override + public boolean isWeapon() + { + return true; + } + + /** + * @return {@code true} if the weapon is magic, {@code false} otherwise. + */ + @Override + public boolean isMagicWeapon() + { + return _isMagicWeapon; + } + + /** + * @return the quantity of SoulShot used. + */ + public int getSoulShotCount() + { + return _soulShotCount; + } + + /** + * @return the quantity of SpiritShot used. + */ + public int getSpiritShotCount() + { + return _spiritShotCount; + } + + /** + * @return the reduced quantity of SoultShot used. + */ + public int getReducedSoulShot() + { + return _reducedSoulshot; + } + + /** + * @return the chance to use Reduced SoultShot. + */ + public int getReducedSoulShotChance() + { + return _reducedSoulshotChance; + } + + /** + * @return the MP consumption with the weapon. + */ + public int getMpConsume() + { + return _mpConsume; + } + + public int getBaseAttackRange() + { + return _baseAttackRange; + } + + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + + /** + * @return the reduced MP consumption with the weapon. + */ + public int getReducedMpConsume() + { + return _reducedMpConsume; + } + + /** + * @return the chance to use getReducedMpConsume() + */ + public int getReducedMpConsumeChance() + { + return _reducedMpConsumeChance; + } + + /** + * @return the Id in which weapon this weapon can be changed. + */ + public int getChangeWeaponId() + { + return _changeWeaponId; + } + + /** + * @return {@code true} if the weapon is force equip, {@code false} otherwise. + */ + public boolean isForceEquip() + { + return _isForceEquip; + } + + /** + * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. + */ + public boolean isAttackWeapon() + { + return _isAttackWeapon; + } + + /** + * @return {@code true} if the weapon is skills only, {@code false} otherwise. + */ + public boolean useWeaponSkillsOnly() + { + return _useWeaponSkillsOnly; + } + + /** + * @param caster the Creature pointing out the caster + * @param target the Creature pointing out the target + * @param trigger + * @param type + */ + public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) + { + forEachSkill(type, holder -> + { + final Skill skill = holder.getSkill(); + if (Rnd.get(100) >= holder.getChance()) + { + return; + } + + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // Trigger only if both are good or bad magic. + if (trigger.isBad() != skill.isBad()) + { + return; + } + + // No Trigger if not Magic Skill or is toggle + if (trigger.isMagic() != skill.isMagic()) + { + return; + } + + // No Trigger if skill is toggle + if (trigger.isToggle()) + { + return; + } + + if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) + { + return; + } + } + + // Skill condition not met + if (!skill.checkCondition(caster, target)) + { + return; + } + + skill.activateSkill(caster, target); + + // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // notify quests of a skill use + if (caster.isPlayer()) + { + World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); + } + if (caster.isPlayer()) + { + final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); + sm.addSkillName(skill); + caster.sendPacket(sm); + } + } + }); + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java new file mode 100644 index 0000000000..610e720125 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -0,0 +1,558 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.network.SystemMessageId; + +/** + * @author UnAfraid + */ +public class AppearanceStone +{ + private final int _id; + private final int _cost; + private final int _visualId; + private final long _lifeTime; + private final AppearanceType _type; + private final WeaponType _weaponType; + private final ArmorType _armorType; + private final AppearanceHandType _handType; + private final AppearanceMagicType _magicType; + private List _crystalTypes; + private List _targetTypes; + private List _bodyParts; + private List _races; + private List _racesNot; + private List _allVisualIds; + + public AppearanceStone(StatSet set) + { + _id = set.getInt("id"); + _visualId = set.getInt("visualId", 0); + _cost = set.getInt("cost", 0); + _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); + _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); + _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); + _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); + _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); + _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); + + final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); + if (targetType != AppearanceTargetType.NONE) + { + addTargetType(targetType); + } + + // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. + final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); + + // If no crystal type is defined, we must add all defaults. + if (crystalType == null) + { + switch (targetType) + { + case ACCESSORY: + case ALL: + { + addCrystalType(CrystalType.NONE); + // fallthrough + } + case WEAPON: + case ARMOR: + { + for (CrystalType cryType : CrystalType.values()) + { + if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) + { + addCrystalType(cryType); + } + } + } + } + } + else + { + addCrystalType(crystalType); + } + + final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); + if (bodyPart != ItemTemplate.SLOT_NONE) + { + addBodyPart(bodyPart); + } + + final Race race = set.getEnum("race", Race.class, Race.NONE); + if (race != Race.NONE) + { + addRace(race); + } + + final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); + if (raceNot != Race.NONE) + { + addRaceNot(raceNot); + } + } + + public int getId() + { + return _id; + } + + public int getVisualId() + { + return _visualId; + } + + public int getCost() + { + return _cost; + } + + public long getLifeTime() + { + return _lifeTime; + } + + public AppearanceType getType() + { + return _type; + } + + public WeaponType getWeaponType() + { + return _weaponType; + } + + public ArmorType getArmorType() + { + return _armorType; + } + + public AppearanceHandType getHandType() + { + return _handType; + } + + public AppearanceMagicType getMagicType() + { + return _magicType; + } + + public void addCrystalType(CrystalType type) + { + if (_crystalTypes == null) + { + _crystalTypes = new ArrayList<>(); + } + _crystalTypes.add(type); + } + + public List getCrystalTypes() + { + return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); + } + + public void addTargetType(AppearanceTargetType type) + { + if (_targetTypes == null) + { + _targetTypes = new ArrayList<>(); + } + _targetTypes.add(type); + } + + public List getTargetTypes() + { + return _targetTypes != null ? _targetTypes : Collections.emptyList(); + } + + public void addBodyPart(long part) + { + if (_bodyParts == null) + { + _bodyParts = new ArrayList<>(); + } + _bodyParts.add(part); + } + + public void addVisualId(AppearanceHolder appearanceHolder) + { + if (_allVisualIds == null) + { + _allVisualIds = new ArrayList<>(); + } + _allVisualIds.add(appearanceHolder); + } + + public List getVisualIds() + { + return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); + } + + public List getBodyParts() + { + return _bodyParts != null ? _bodyParts : Collections.emptyList(); + } + + public void addRace(Race race) + { + if (_races == null) + { + _races = new ArrayList<>(); + } + _races.add(race); + } + + public List getRaces() + { + return _races != null ? _races : Collections.emptyList(); + } + + public void addRaceNot(Race race) + { + if (_racesNot == null) + { + _racesNot = new ArrayList<>(); + } + _racesNot.add(race); + } + + public List getRacesNot() + { + return _racesNot != null ? _racesNot : Collections.emptyList(); + } + + /** + * @param player the actor requesting to use this appearance. + * @param targetItem the item to be modified with this appearance. + * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. + */ + public boolean checkConditions(Player player, Item targetItem) + { + if (targetItem == null) + { + return false; + } + + if (getTargetTypes().isEmpty()) + { + return false; + } + + if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); + return false; + } + + switch (_type) + { + case RESTORE: + { + if (targetItem.getVisualId() == 0) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); + return false; + } + + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + default: + { + // Seems like in retail item with already changed appearance, can be changed again without being restored. + + final AppearanceTargetType targetType = getTargetTypes().get(0); + switch (targetType) + { + case NONE: + { + return false; + } + case WEAPON: + { + if (!targetItem.isWeapon()) + { + player.sendPacket(SystemMessageId.WEAPONS_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ARMOR: + { + if (!targetItem.isArmor()) + { + player.sendPacket(SystemMessageId.ARMOR_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ACCESSORY: + { + if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + { + player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); + return false; + } + break; + } + case ALL: + { + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (findVisualChange(targetItem) == null) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + return true; + } + } + break; + } + } + + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (_weaponType != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) + { + if (_weaponType != WeaponType.CROSSBOW) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + } + + switch (_handType) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + } + + switch (_magicType) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + if (_armorType != ArmorType.NONE) + { + switch (_armorType) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + return true; + } + + public AppearanceHolder findVisualChange(Item targetItem) + { + for (AppearanceHolder holder : _allVisualIds) + { + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + { + continue; + } + + if (holder.getWeaponType() != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) + { + if (holder.getWeaponType() != WeaponType.CROSSBOW) + { + continue; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + continue; + } + } + + switch (holder.getHandType()) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + continue; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + continue; + } + break; + } + } + + switch (holder.getMagicType()) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + continue; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + continue; + } + } + } + } + + if (holder.getArmorType() != ArmorType.NONE) + { + switch (holder.getArmorType()) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + continue; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + continue; + } + } + } + } + return holder; + } + return null; + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java new file mode 100644 index 0000000000..6f73983c0e --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -0,0 +1,65 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import java.util.EnumMap; +import java.util.Map; + +import org.l2jmobius.gameserver.model.StatSet; + +/** + * @author UnAfraid + */ +public class CombinationItem +{ + private final int _itemOne; + private final int _itemTwo; + private final int _chance; + private final Map _rewards = new EnumMap<>(CombinationItemType.class); + + public CombinationItem(StatSet set) + { + _itemOne = set.getInt("one"); + _itemTwo = set.getInt("two"); + _chance = set.getInt("chance"); + } + + public int getItemOne() + { + return _itemOne; + } + + public int getItemTwo() + { + return _itemTwo; + } + + public int getChance() + { + return _chance; + } + + public void addReward(CombinationItemReward item) + { + _rewards.put(item.getType(), item); + } + + public CombinationItemReward getReward(CombinationItemType type) + { + return _rewards.get(type); + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java new file mode 100644 index 0000000000..8890655085 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -0,0 +1,210 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.logging.Logger; + +import org.l2jmobius.commons.util.CommonUtil; +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public abstract class AbstractEnchantItem +{ + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); + + private static final ItemType[] ENCHANT_TYPES = new ItemType[] + { + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + EtcItemType.BLESS_ENCHT_AM, + EtcItemType.BLESS_ENCHT_AM_DOWN, + EtcItemType.BLESS_ENCHT_WP, + EtcItemType.ENCHT_AM, + EtcItemType.ENCHT_WP, + EtcItemType.GIANT_ENCHT_AM, + EtcItemType.GIANT_ENCHT_WP, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + }; + + private final int _id; + private final CrystalType _grade; + private final int _minEnchantLevel; + private final int _maxEnchantLevel; + private final int _safeEnchantLevel; + private final int _randomEnchantMin; + private final int _randomEnchantMax; + private final double _bonusRate; + + public AbstractEnchantItem(StatSet set) + { + _id = set.getInt("id"); + if (getItem() == null) + { + throw new NullPointerException(); + } + else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) + { + throw new IllegalAccessError(); + } + _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); + _minEnchantLevel = set.getInt("minEnchant", 0); + _maxEnchantLevel = set.getInt("maxEnchant", 127); + _safeEnchantLevel = set.getInt("safeEnchant", 0); + _randomEnchantMin = set.getInt("randomEnchantMin", 1); + _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); + _bonusRate = set.getDouble("bonusRate", 0); + } + + /** + * @return id of current item + */ + public int getId() + { + return _id; + } + + /** + * @return bonus chance that would be added + */ + public double getBonusRate() + { + return _bonusRate; + } + + /** + * @return {@link ItemTemplate} current item/scroll + */ + public ItemTemplate getItem() + { + return ItemTable.getInstance().getTemplate(_id); + } + + /** + * @return grade of the item/scroll. + */ + public CrystalType getGrade() + { + return _grade; + } + + /** + * @return {@code true} if scroll is for weapon, {@code false} for armor + */ + public abstract boolean isWeapon(); + + /** + * @return the minimum enchant level that this scroll/item can be used with + */ + public int getMinEnchantLevel() + { + return _minEnchantLevel; + } + + /** + * @return the maximum enchant level that this scroll/item can be used with + */ + public int getMaxEnchantLevel() + { + return _maxEnchantLevel; + } + + /** + * @return the safe enchant level of this scroll/item + */ + public int getSafeEnchant() + { + return _safeEnchantLevel; + } + + /** + * @return the minimum random enchant level of this scroll/item + */ + public int getRandomEnchantMin() + { + return _randomEnchantMin; + } + + /** + * @return the maximum random enchant level of this scroll/item + */ + public int getRandomEnchantMax() + { + return _randomEnchantMax; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem + * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise + */ + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if (itemToEnchant == null) + { + return false; + } + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + { + return false; + } + else if (!isValidItemType(itemToEnchant.getItem().getType2())) + { + return false; + } + else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) + { + return false; + } + else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + { + return false; + } + return true; + } + + /** + * @param type2 + * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise + */ + private boolean isValidItemType(int type2) + { + if (type2 == ItemTemplate.TYPE2_WEAPON) + { + return isWeapon(); + } + else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) + { + return !isWeapon(); + } + return false; + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..1099b77054 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private long _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(long slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 93% rename from L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index e2c2f6ad68..9a80e104b0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.stats.Stat; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java new file mode 100644 index 0000000000..bfe1c295da --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -0,0 +1,57 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public class EnchantSupportItem extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isGiant; + private final ItemType type; + + public EnchantSupportItem(StatSet set) + { + super(set); + type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + public boolean isBlessed() + { + return _isBlessed; + } + + public boolean isGiant() + { + return _isGiant; + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java index b196da7407..659d9f04bf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -72,15 +72,15 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java new file mode 100644 index 0000000000..c8a309674f --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -0,0 +1,88 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Crystal Type enumerated. + * @author Adry_85 + */ +public enum CrystalType +{ + NONE(0, 0, 0, 0), + D(1, 1458, 11, 90), + C(2, 1459, 6, 45), + B(3, 1460, 11, 67), + A(4, 1461, 20, 145), + S(5, 1462, 25, 250), + S80(6, 1462, 25, 250), + S84(7, 1462, 25, 250), + R(8, 17371, 30, 500), + R95(9, 17371, 30, 500), + R99(10, 17371, 30, 500), + EVENT(11, 0, 0, 0); + + private final int _level; + private final int _crystalId; + private final int _crystalEnchantBonusArmor; + private final int _crystalEnchantBonusWeapon; + + CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) + { + _level = level; + _crystalId = crystalId; + _crystalEnchantBonusArmor = crystalEnchantBonusArmor; + _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; + } + + /** + * Gets the crystal type ID. + * @return the crystal type ID + */ + public int getLevel() + { + return _level; + } + + /** + * Gets the item ID of the crystal. + * @return the item ID of the crystal + */ + public int getCrystalId() + { + return _crystalId; + } + + public int getCrystalEnchantBonusArmor() + { + return _crystalEnchantBonusArmor; + } + + public int getCrystalEnchantBonusWeapon() + { + return _crystalEnchantBonusWeapon; + } + + public boolean isGreater(CrystalType crystalType) + { + return getLevel() > crystalType.getLevel(); + } + + public boolean isLesser(CrystalType crystalType) + { + return getLevel() < crystalType.getLevel(); + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java new file mode 100644 index 0000000000..834b0c3996 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -0,0 +1,105 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * EtcItem Type enumerated. + */ +public enum EtcItemType implements ItemType +{ + NONE, + SCROLL, + ARROW, + POTION, + SPELLBOOK, + RECIPE, + MATERIAL, + PET_COLLAR, + CASTLE_GUARD, + DYE, + SEED, + SEED2, + HARVEST, + LOTTO, + RACE_TICKET, + TICKET_OF_LORD, + LURE, + CROP, + MATURECROP, + ENCHT_WP, + ENCHT_AM, + GIANT_ENCHT_WP, + GIANT_ENCHT_AM, + BLESS_ENCHT_WP, + BLESS_ENCHT_AM, + BLESS_ENCHT_AM_DOWN, + COUPON, + ELIXIR, + ENCHT_ATTR, + ENCHT_ATTR_CURSED, + BOLT, + ENCHT_ATTR_INC_PROP_ENCHT_WP, + ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_RUNE, + ENCHT_ATTRT_RUNE_SELECT, + TELEPORTBOOKMARK, + CHANGE_ATTR, + SOULSHOT, + SHAPE_SHIFTING_WP, + BLESS_SHAPE_SHIFTING_WP, + // EIT_RESTORE_SHAPE_SHIFTING_WP, + SHAPE_SHIFTING_WP_FIXED, + SHAPE_SHIFTING_AM, + BLESS_SHAPE_SHIFTING_AM, + SHAPE_SHIFTING_AM_FIXED, + SHAPE_SHIFTING_HAIRACC, + BLESS_SHAPE_SHIFTING_HAIRACC, + SHAPE_SHIFTING_HAIRACC_FIXED, + RESTORE_SHAPE_SHIFTING_WP, + RESTORE_SHAPE_SHIFTING_AM, + RESTORE_SHAPE_SHIFTING_HAIRACC, + RESTORE_SHAPE_SHIFTING_ALLITEM, + BLESS_INC_PROP_ENCHT_WP, + BLESS_INC_PROP_ENCHT_AM, + CARD_EVENT, + SHAPE_SHIFTING_ALLITEM_FIXED, + MULTI_ENCHT_WP, + MULTI_ENCHT_AM, + MULTI_INC_PROB_ENCHT_WP, + MULTI_INC_PROB_ENCHT_AM, + SOUL_CRYSTAL, + ENSOUL_STONE; + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return 0; + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 8323d4bdc7..06760564d7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 28c2827a48..e1ff97cab1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -54,14 +54,14 @@ import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 6f6d11a97d..c8e13e1e2c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java deleted file mode 100644 index 5618132356..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ /dev/null @@ -1,300 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.Collection; -import java.util.Objects; - -import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * This class contains Item
- * Use to sort Item of : - *
    - *
  • Armor
    • - *
  • EtcItem
    • - *
  • Weapon
    • - *
- * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ - */ -public class WarehouseItem -{ - private final ItemTemplate _item; - private final int _object; - private final long _count; - private final int _owner; - private final int _locationSlot; - private final int _enchant; - private final CrystalType _grade; - private final VariationInstance _augmentation; - private final int _customType1; - private final int _customType2; - private final int _mana; - - private byte _elemAtkType = -2; - private int _elemAtkPower = 0; - - private final int[] _elemDefAttr = - { - 0, - 0, - 0, - 0, - 0, - 0 - }; - - private final int[] _enchantOptions; - private final Collection _soulCrystalOptions; - private final Collection _soulCrystalSpecialOptions; - - private final int _time; - - public WarehouseItem(Item item) - { - Objects.requireNonNull(item); - _item = item.getItem(); - _object = item.getObjectId(); - _count = item.getCount(); - _owner = item.getOwnerId(); - _locationSlot = item.getLocationSlot(); - _enchant = item.getEnchantLevel(); - _customType1 = item.getCustomType1(); - _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); - _augmentation = item.getAugmentation(); - _mana = item.getMana(); - _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; - _elemAtkType = item.getAttackAttributeType().getClientId(); - _elemAtkPower = item.getAttackAttributePower(); - for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) - { - _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); - } - _enchantOptions = item.getEnchantOptions(); - _soulCrystalOptions = item.getSpecialAbilities(); - _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); - } - - /** - * @return the item. - */ - public ItemTemplate getItem() - { - return _item; - } - - /** - * @return the unique objectId. - */ - public int getObjectId() - { - return _object; - } - - /** - * @return the owner. - */ - public int getOwnerId() - { - return _owner; - } - - /** - * @return the location slot. - */ - public int getLocationSlot() - { - return _locationSlot; - } - - /** - * @return the count. - */ - public long getCount() - { - return _count; - } - - /** - * @return the first type. - */ - public int getType1() - { - return _item.getType1(); - } - - /** - * @return the second type. - */ - public int getType2() - { - return _item.getType2(); - } - - /** - * @return the second type. - */ - public ItemType getItemType() - { - return _item.getItemType(); - } - - /** - * @return the ItemId. - */ - public int getItemId() - { - return _item.getId(); - } - - /** - * @return the part of body used with this item. - */ - public long getBodyPart() - { - return _item.getBodyPart(); - } - - /** - * @return the enchant level. - */ - public int getEnchantLevel() - { - return _enchant; - } - - /** - * @return the item grade - */ - public CrystalType getItemGrade() - { - return _grade; - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - public boolean isWeapon() - { - return (_item instanceof Weapon); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise. - */ - public boolean isArmor() - { - return (_item instanceof Armor); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - public boolean isEtcItem() - { - return (_item instanceof EtcItem); - } - - /** - * @return the name of the item - */ - public String getItemName() - { - return _item.getName(); - } - - /** - * @return the augmentation If. - */ - public VariationInstance getAugmentation() - { - return _augmentation; - } - - /** - * @return the name of the item - */ - public String getName() - { - return _item.getName(); - } - - public int getCustomType1() - { - return _customType1; - } - - public int getCustomType2() - { - return _customType2; - } - - public int getMana() - { - return _mana; - } - - public byte getAttackElementType() - { - return _elemAtkType; - } - - public int getAttackElementPower() - { - return _elemAtkPower; - } - - public int getElementDefAttr(byte i) - { - return _elemDefAttr[i]; - } - - public int[] getEnchantOptions() - { - return _enchantOptions; - } - - public Collection getSoulCrystalOptions() - { - return _soulCrystalOptions; - } - - public Collection getSoulCrystalSpecialOptions() - { - return _soulCrystalSpecialOptions; - } - - public int getTime() - { - return _time; - } - - /** - * @return the name of the item - */ - @Override - public String toString() - { - return _item.toString(); - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Weapon.java deleted file mode 100644 index 85bb22d23b..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is dedicated to the management of weapons. - */ -public class Weapon extends ItemTemplate -{ - private WeaponType _type; - private boolean _isMagicWeapon; - private int _soulShotCount; - private int _spiritShotCount; - private int _mpConsume; - private int _baseAttackRange; - private int _baseAttackRadius; - private int _baseAttackAngle; - private int _changeWeaponId; - - private int _reducedSoulshot; - private int _reducedSoulshotChance; - - private int _reducedMpConsume; - private int _reducedMpConsumeChance; - - private boolean _isForceEquip; - private boolean _isAttackWeapon; - private boolean _useWeaponSkillsOnly; - - /** - * Constructor for Weapon. - * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. - */ - public Weapon(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_WEAPON; - _isMagicWeapon = set.getBoolean("is_magic_weapon", false); - _soulShotCount = set.getInt("soulshots", 0); - _spiritShotCount = set.getInt("spiritshots", 0); - _mpConsume = set.getInt("mp_consume", 0); - _baseAttackRange = set.getInt("attack_range", 40); - final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) - { - _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); - } - else - { - _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 - } - - final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); - _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; - _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; - - final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); - _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; - _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; - _changeWeaponId = set.getInt("change_weaponId", 0); - _isForceEquip = set.getBoolean("isForceEquip", false); - _isAttackWeapon = set.getBoolean("isAttackWeapon", true); - _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); - } - - /** - * @return the type of Weapon - */ - @Override - public WeaponType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - @Override - public boolean isWeapon() - { - return true; - } - - /** - * @return {@code true} if the weapon is magic, {@code false} otherwise. - */ - @Override - public boolean isMagicWeapon() - { - return _isMagicWeapon; - } - - /** - * @return the quantity of SoulShot used. - */ - public int getSoulShotCount() - { - return _soulShotCount; - } - - /** - * @return the quantity of SpiritShot used. - */ - public int getSpiritShotCount() - { - return _spiritShotCount; - } - - /** - * @return the reduced quantity of SoultShot used. - */ - public int getReducedSoulShot() - { - return _reducedSoulshot; - } - - /** - * @return the chance to use Reduced SoultShot. - */ - public int getReducedSoulShotChance() - { - return _reducedSoulshotChance; - } - - /** - * @return the MP consumption with the weapon. - */ - public int getMpConsume() - { - return _mpConsume; - } - - public int getBaseAttackRange() - { - return _baseAttackRange; - } - - public int getBaseAttackRadius() - { - return _baseAttackRadius; - } - - public int getBaseAttackAngle() - { - return _baseAttackAngle; - } - - /** - * @return the reduced MP consumption with the weapon. - */ - public int getReducedMpConsume() - { - return _reducedMpConsume; - } - - /** - * @return the chance to use getReducedMpConsume() - */ - public int getReducedMpConsumeChance() - { - return _reducedMpConsumeChance; - } - - /** - * @return the Id in which weapon this weapon can be changed. - */ - public int getChangeWeaponId() - { - return _changeWeaponId; - } - - /** - * @return {@code true} if the weapon is force equip, {@code false} otherwise. - */ - public boolean isForceEquip() - { - return _isForceEquip; - } - - /** - * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. - */ - public boolean isAttackWeapon() - { - return _isAttackWeapon; - } - - /** - * @return {@code true} if the weapon is skills only, {@code false} otherwise. - */ - public boolean useWeaponSkillsOnly() - { - return _useWeaponSkillsOnly; - } - - /** - * @param caster the Creature pointing out the caster - * @param target the Creature pointing out the target - * @param trigger - * @param type - */ - public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) - { - forEachSkill(type, holder -> - { - final Skill skill = holder.getSkill(); - if (Rnd.get(100) >= holder.getChance()) - { - return; - } - - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // Trigger only if both are good or bad magic. - if (trigger.isBad() != skill.isBad()) - { - return; - } - - // No Trigger if not Magic Skill or is toggle - if (trigger.isMagic() != skill.isMagic()) - { - return; - } - - // No Trigger if skill is toggle - if (trigger.isToggle()) - { - return; - } - - if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) - { - return; - } - } - - // Skill condition not met - if (!skill.checkCondition(caster, target)) - { - return; - } - - skill.activateSkill(caster, target); - - // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // notify quests of a skill use - if (caster.isPlayer()) - { - World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); - } - if (caster.isPlayer()) - { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); - sm.addSkillName(skill); - caster.sendPacket(sm); - } - } - }); - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java deleted file mode 100644 index a568389489..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ /dev/null @@ -1,558 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author UnAfraid - */ -public class AppearanceStone -{ - private final int _id; - private final int _cost; - private final int _visualId; - private final long _lifeTime; - private final AppearanceType _type; - private final WeaponType _weaponType; - private final ArmorType _armorType; - private final AppearanceHandType _handType; - private final AppearanceMagicType _magicType; - private List _crystalTypes; - private List _targetTypes; - private List _bodyParts; - private List _races; - private List _racesNot; - private List _allVisualIds; - - public AppearanceStone(StatSet set) - { - _id = set.getInt("id"); - _visualId = set.getInt("visualId", 0); - _cost = set.getInt("cost", 0); - _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); - _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); - _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); - _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); - _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); - _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); - - final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); - if (targetType != AppearanceTargetType.NONE) - { - addTargetType(targetType); - } - - // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. - final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); - - // If no crystal type is defined, we must add all defaults. - if (crystalType == null) - { - switch (targetType) - { - case ACCESSORY: - case ALL: - { - addCrystalType(CrystalType.NONE); - // fallthrough - } - case WEAPON: - case ARMOR: - { - for (CrystalType cryType : CrystalType.values()) - { - if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) - { - addCrystalType(cryType); - } - } - } - } - } - else - { - addCrystalType(crystalType); - } - - final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); - if (bodyPart != ItemTemplate.SLOT_NONE) - { - addBodyPart(bodyPart); - } - - final Race race = set.getEnum("race", Race.class, Race.NONE); - if (race != Race.NONE) - { - addRace(race); - } - - final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); - if (raceNot != Race.NONE) - { - addRaceNot(raceNot); - } - } - - public int getId() - { - return _id; - } - - public int getVisualId() - { - return _visualId; - } - - public int getCost() - { - return _cost; - } - - public long getLifeTime() - { - return _lifeTime; - } - - public AppearanceType getType() - { - return _type; - } - - public WeaponType getWeaponType() - { - return _weaponType; - } - - public ArmorType getArmorType() - { - return _armorType; - } - - public AppearanceHandType getHandType() - { - return _handType; - } - - public AppearanceMagicType getMagicType() - { - return _magicType; - } - - public void addCrystalType(CrystalType type) - { - if (_crystalTypes == null) - { - _crystalTypes = new ArrayList<>(); - } - _crystalTypes.add(type); - } - - public List getCrystalTypes() - { - return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); - } - - public void addTargetType(AppearanceTargetType type) - { - if (_targetTypes == null) - { - _targetTypes = new ArrayList<>(); - } - _targetTypes.add(type); - } - - public List getTargetTypes() - { - return _targetTypes != null ? _targetTypes : Collections.emptyList(); - } - - public void addBodyPart(long part) - { - if (_bodyParts == null) - { - _bodyParts = new ArrayList<>(); - } - _bodyParts.add(part); - } - - public void addVisualId(AppearanceHolder appearanceHolder) - { - if (_allVisualIds == null) - { - _allVisualIds = new ArrayList<>(); - } - _allVisualIds.add(appearanceHolder); - } - - public List getVisualIds() - { - return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); - } - - public List getBodyParts() - { - return _bodyParts != null ? _bodyParts : Collections.emptyList(); - } - - public void addRace(Race race) - { - if (_races == null) - { - _races = new ArrayList<>(); - } - _races.add(race); - } - - public List getRaces() - { - return _races != null ? _races : Collections.emptyList(); - } - - public void addRaceNot(Race race) - { - if (_racesNot == null) - { - _racesNot = new ArrayList<>(); - } - _racesNot.add(race); - } - - public List getRacesNot() - { - return _racesNot != null ? _racesNot : Collections.emptyList(); - } - - /** - * @param player the actor requesting to use this appearance. - * @param targetItem the item to be modified with this appearance. - * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. - */ - public boolean checkConditions(Player player, Item targetItem) - { - if (targetItem == null) - { - return false; - } - - if (getTargetTypes().isEmpty()) - { - return false; - } - - if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); - return false; - } - - switch (_type) - { - case RESTORE: - { - if (targetItem.getVisualId() == 0) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); - return false; - } - - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - default: - { - // Seems like in retail item with already changed appearance, can be changed again without being restored. - - final AppearanceTargetType targetType = getTargetTypes().get(0); - switch (targetType) - { - case NONE: - { - return false; - } - case WEAPON: - { - if (!targetItem.isWeapon()) - { - player.sendPacket(SystemMessageId.WEAPONS_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ARMOR: - { - if (!targetItem.isArmor()) - { - player.sendPacket(SystemMessageId.ARMOR_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ACCESSORY: - { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) - { - player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); - return false; - } - break; - } - case ALL: - { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (findVisualChange(targetItem) == null) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - return true; - } - } - break; - } - } - - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (_weaponType != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) - { - if (_weaponType != WeaponType.CROSSBOW) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - } - - switch (_handType) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - } - - switch (_magicType) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - if (_armorType != ArmorType.NONE) - { - switch (_armorType) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - return true; - } - - public AppearanceHolder findVisualChange(Item targetItem) - { - for (AppearanceHolder holder : _allVisualIds) - { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) - { - continue; - } - - if (holder.getWeaponType() != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) - { - if (holder.getWeaponType() != WeaponType.CROSSBOW) - { - continue; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - continue; - } - } - - switch (holder.getHandType()) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - continue; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - continue; - } - break; - } - } - - switch (holder.getMagicType()) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - continue; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - continue; - } - } - } - } - - if (holder.getArmorType() != ArmorType.NONE) - { - switch (holder.getArmorType()) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - continue; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - continue; - } - } - } - } - return holder; - } - return null; - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java deleted file mode 100644 index a2897ba911..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import java.util.EnumMap; -import java.util.Map; - -import org.l2jmobius.gameserver.model.StatSet; - -/** - * @author UnAfraid - */ -public class CombinationItem -{ - private final int _itemOne; - private final int _itemTwo; - private final int _chance; - private final Map _rewards = new EnumMap<>(CombinationItemType.class); - - public CombinationItem(StatSet set) - { - _itemOne = set.getInt("one"); - _itemTwo = set.getInt("two"); - _chance = set.getInt("chance"); - } - - public int getItemOne() - { - return _itemOne; - } - - public int getItemTwo() - { - return _itemTwo; - } - - public int getChance() - { - return _chance; - } - - public void addReward(CombinationItemReward item) - { - _rewards.put(item.getType(), item); - } - - public CombinationItemReward getReward(CombinationItemType type) - { - return _rewards.get(type); - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java deleted file mode 100644 index a09b01d571..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.logging.Logger; - -import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public abstract class AbstractEnchantItem -{ - protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); - - private static final ItemType[] ENCHANT_TYPES = new ItemType[] - { - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - EtcItemType.BLESS_ENCHT_AM, - EtcItemType.BLESS_ENCHT_AM_DOWN, - EtcItemType.BLESS_ENCHT_WP, - EtcItemType.ENCHT_AM, - EtcItemType.ENCHT_WP, - EtcItemType.GIANT_ENCHT_AM, - EtcItemType.GIANT_ENCHT_WP, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - }; - - private final int _id; - private final CrystalType _grade; - private final int _minEnchantLevel; - private final int _maxEnchantLevel; - private final int _safeEnchantLevel; - private final int _randomEnchantMin; - private final int _randomEnchantMax; - private final double _bonusRate; - - public AbstractEnchantItem(StatSet set) - { - _id = set.getInt("id"); - if (getItem() == null) - { - throw new NullPointerException(); - } - else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) - { - throw new IllegalAccessError(); - } - _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); - _minEnchantLevel = set.getInt("minEnchant", 0); - _maxEnchantLevel = set.getInt("maxEnchant", 127); - _safeEnchantLevel = set.getInt("safeEnchant", 0); - _randomEnchantMin = set.getInt("randomEnchantMin", 1); - _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); - _bonusRate = set.getDouble("bonusRate", 0); - } - - /** - * @return id of current item - */ - public int getId() - { - return _id; - } - - /** - * @return bonus chance that would be added - */ - public double getBonusRate() - { - return _bonusRate; - } - - /** - * @return {@link ItemTemplate} current item/scroll - */ - public ItemTemplate getItem() - { - return ItemTable.getInstance().getTemplate(_id); - } - - /** - * @return grade of the item/scroll. - */ - public CrystalType getGrade() - { - return _grade; - } - - /** - * @return {@code true} if scroll is for weapon, {@code false} for armor - */ - public abstract boolean isWeapon(); - - /** - * @return the minimum enchant level that this scroll/item can be used with - */ - public int getMinEnchantLevel() - { - return _minEnchantLevel; - } - - /** - * @return the maximum enchant level that this scroll/item can be used with - */ - public int getMaxEnchantLevel() - { - return _maxEnchantLevel; - } - - /** - * @return the safe enchant level of this scroll/item - */ - public int getSafeEnchant() - { - return _safeEnchantLevel; - } - - /** - * @return the minimum random enchant level of this scroll/item - */ - public int getRandomEnchantMin() - { - return _randomEnchantMin; - } - - /** - * @return the maximum random enchant level of this scroll/item - */ - public int getRandomEnchantMax() - { - return _randomEnchantMax; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem - * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise - */ - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if (itemToEnchant == null) - { - return false; - } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) - { - return false; - } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) - { - return false; - } - else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) - { - return false; - } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) - { - return false; - } - return true; - } - - /** - * @param type2 - * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise - */ - private boolean isValidItemType(int type2) - { - if (type2 == ItemTemplate.TYPE2_WEAPON) - { - return isWeapon(); - } - else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) - { - return !isWeapon(); - } - return false; - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fe698d8e2a..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private long _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(long slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java deleted file mode 100644 index 13d6b5a2ee..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public class EnchantSupportItem extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isGiant; - private final ItemType type; - - public EnchantSupportItem(StatSet set) - { - super(set); - type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - public boolean isBlessed() - { - return _isBlessed; - } - - public boolean isGiant() - { - return _isGiant; - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java deleted file mode 100644 index d059efd025..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Crystal Type enumerated. - * @author Adry_85 - */ -public enum CrystalType -{ - NONE(0, 0, 0, 0), - D(1, 1458, 11, 90), - C(2, 1459, 6, 45), - B(3, 1460, 11, 67), - A(4, 1461, 20, 145), - S(5, 1462, 25, 250), - S80(6, 1462, 25, 250), - S84(7, 1462, 25, 250), - R(8, 17371, 30, 500), - R95(9, 17371, 30, 500), - R99(10, 17371, 30, 500), - EVENT(11, 0, 0, 0); - - private final int _level; - private final int _crystalId; - private final int _crystalEnchantBonusArmor; - private final int _crystalEnchantBonusWeapon; - - CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) - { - _level = level; - _crystalId = crystalId; - _crystalEnchantBonusArmor = crystalEnchantBonusArmor; - _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; - } - - /** - * Gets the crystal type ID. - * @return the crystal type ID - */ - public int getLevel() - { - return _level; - } - - /** - * Gets the item ID of the crystal. - * @return the item ID of the crystal - */ - public int getCrystalId() - { - return _crystalId; - } - - public int getCrystalEnchantBonusArmor() - { - return _crystalEnchantBonusArmor; - } - - public int getCrystalEnchantBonusWeapon() - { - return _crystalEnchantBonusWeapon; - } - - public boolean isGreater(CrystalType crystalType) - { - return getLevel() > crystalType.getLevel(); - } - - public boolean isLesser(CrystalType crystalType) - { - return getLevel() < crystalType.getLevel(); - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java deleted file mode 100644 index b352bd7fc0..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * EtcItem Type enumerated. - */ -public enum EtcItemType implements ItemType -{ - NONE, - SCROLL, - ARROW, - POTION, - SPELLBOOK, - RECIPE, - MATERIAL, - PET_COLLAR, - CASTLE_GUARD, - DYE, - SEED, - SEED2, - HARVEST, - LOTTO, - RACE_TICKET, - TICKET_OF_LORD, - LURE, - CROP, - MATURECROP, - ENCHT_WP, - ENCHT_AM, - GIANT_ENCHT_WP, - GIANT_ENCHT_AM, - BLESS_ENCHT_WP, - BLESS_ENCHT_AM, - BLESS_ENCHT_AM_DOWN, - COUPON, - ELIXIR, - ENCHT_ATTR, - ENCHT_ATTR_CURSED, - BOLT, - ENCHT_ATTR_INC_PROP_ENCHT_WP, - ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_RUNE, - ENCHT_ATTRT_RUNE_SELECT, - TELEPORTBOOKMARK, - CHANGE_ATTR, - SOULSHOT, - SHAPE_SHIFTING_WP, - BLESS_SHAPE_SHIFTING_WP, - // EIT_RESTORE_SHAPE_SHIFTING_WP, - SHAPE_SHIFTING_WP_FIXED, - SHAPE_SHIFTING_AM, - BLESS_SHAPE_SHIFTING_AM, - SHAPE_SHIFTING_AM_FIXED, - SHAPE_SHIFTING_HAIRACC, - BLESS_SHAPE_SHIFTING_HAIRACC, - SHAPE_SHIFTING_HAIRACC_FIXED, - RESTORE_SHAPE_SHIFTING_WP, - RESTORE_SHAPE_SHIFTING_AM, - RESTORE_SHAPE_SHIFTING_HAIRACC, - RESTORE_SHAPE_SHIFTING_ALLITEM, - BLESS_INC_PROP_ENCHT_WP, - BLESS_INC_PROP_ENCHT_AM, - CARD_EVENT, - SHAPE_SHIFTING_ALLITEM_FIXED, - MULTI_ENCHT_WP, - MULTI_ENCHT_AM, - MULTI_INC_PROB_ENCHT_WP, - MULTI_INC_PROB_ENCHT_AM, - SOUL_CRYSTAL, - ENSOUL_STONE; - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return 0; - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c807e1298e..0fcb8c33e4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 5bf10abc0f..7929fbbe60 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java index 7d30237cb1..d9c41811d2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java index 80eec709d8..1e18bcb9ad 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 527e0b0938..f93380fc15 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 777ba0c3c7..ba26674462 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index ec7537f935..4c7fa317a0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 98ad03f40d..5e9d4175d5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 38a7116383..ff0ad75b8a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index c1cac0d20a..02c4f00cf6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 1839afb5ce..334fb9252a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 7109a54ed1..5df6b208a3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index 165f9b4668..80e30184ff 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index df3acc3df1..7c51b0ad38 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index bab0af38a8..1c31ff4a11 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index cfb6455ad0..31d29ef3dd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index f467c9e4c3..e25524223a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index a397ed5ef8..99e497af54 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -52,8 +52,8 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index dc02d363c8..ea86074f0e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 543774b24c..e1c584d405 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 8e4db9d92c..a7e3f28ed6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 0d59d2ff65..e8d7efa6b0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 85dbfd4647..ed78abf81d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 7642b46cbf..a99d5fcb63 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 6cc03e2c2b..48cdb8e80b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 9e824ae2f0..8ee8e52cca 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 21dcd2d13d..9565b3e5ca 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 6b1a6a94e8..1b20e2e248 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 29f7828f27..a9fd8d923a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 12bc7c708d..79e1193ac0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index ce98ab493d..d0add3fa49 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 595da81538..ab9f0c33f7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 945ff531e4..b9c3900403 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 1ee323a63c..7da966ce9f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 989d2e582f..2c715b4efb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d7fcffbdb5..4468b67642 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index ce66388a02..ecb0ab9738 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index fb025563e6..d7d4d2b449 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 60cfa6b927..6d1eea218a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 61920f471b..f89be1cfcb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index ff361e97a4..1840fcded7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 17fa6aeaf2..f02aaa9ace 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 21fff6182a..bf6304577f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 81e3a8f4c9..7e89bd6ed3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index e7a8e8baf6..7fbd7ebecb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 56cf3b84cc..b9a7aadbf7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 59c63fceca..acee799091 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index a4f0ecaefb..d5690408da 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51cd76618e..af8b12547e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 38bda2e6fb..e9cd6a88b8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 3ec3d494e8..db168592f1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 93588924fe..077f33cb49 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 07725028a6..76375a86f7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c9e5eabc7..ef1d37297e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index e4fb9e4160..b65005003d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 51abfa9d3e..f49138fafe 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 4bd0a38bda..7e0614b359 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 6d0df16c27..0e6e64c7b2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 61a01d067c..658087380a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 84bc5a6eba..3800940bac 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index b79342c0a8..3a780986a0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index bd768c74e2..c4598a72e6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index a5616075a6..e1da19cc8f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ced39204d3..fbb5c84dfe 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4068629bde..d05590cbde 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index d8f88333df..df50db952f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index d48b66c6ef..9d9b24a54f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c742d534c4..c59568bf1d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index a22b36335e..35ca986d35 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 271ec4401b..37150ec357 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 6b8cd1358f..c32d4f7c04 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java index 3c87faec44..f61481565a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.vip; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/DocumentBase.java index 65e18e4a0e..bcbe96ad19 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -134,9 +137,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/SiegeGuards.java index 8ac4fe72af..c9ca7df743 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index fa45b28c67..42d382f269 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index dd4215411e..a8e6c06eed 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 418ed93b2a..4081019df2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 5b1db54836..e7113941ec 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index f73f3c2e73..5d3caadfd5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 6a67c2d642..2e5b2846bf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index dd5c2f593d..2ea2bf9f11 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 4e5a8d7aaf..1950403a0d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d5d2ad10cf..8f4db5d580 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 24d5d75b7a..704f15e5ba 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index a403724d9a..10d1c9e03b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2b6db19588..607dc3b8f5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 437b502a95..b8985f0fef 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 6e7baf8033..b02e2fa787 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index 1866a34d94..b7c74b3b74 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 7f55fdc9ed..7e0edf65b8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 28b0f453fc..5c2f25e7f2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 2ed9c1c346..7f5e0e87a1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index ebbd33bda0..f952b58fa2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 189a2f7e73..714a195ccb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index abb1a84fd5..e25bb1c5c2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java index fbcd2b94a4..d3f80b04fe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 7d2f4894c6..770b66ee92 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 02468039cf..742f98e38b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 742ca00283..3d97c9ac22 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 3eb4d77710..8b4d315b50 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index a88c6c50c5..0aa5cb3e1f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index aaa9641567..721bf8ce08 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6f313482ab..54230f39a1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b4ea6e761f..bfc5324c4d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 410e71cff8..01714d7f5a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VipUp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VipUp.java index 9cf1267bbb..f716953da2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VipUp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VipUp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java index ad487044b9..db8516fac9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ElementalSpirit; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index ecb73b365e..30e5fd51af 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 80351144d6..44599b2555 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 2472a2d955..85d614b478 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index d1d5c8c332..c2610ec4e3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index abf3b47d43..d0c1cf040c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 3ae04b22f4..c32e1327ea 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index a02dc34079..8167aa1eef 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 02629d5d34..e17c4d3c90 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27f0904f0f..a61cc1bd71 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 255f805e72..12f575b243 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index 3988e77104..587f809dc9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 77b9a03185..c0d47bc8de 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java index 4e5984b292..efde71ba49 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java index e70725593d..954c6b4142 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java index a3a6734f90..13e468df91 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.QuestSoundHtmlHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java index d29aaf54b5..7773083c9a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java index cb732dea8c..bd13a4bbe9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java index 00920614ce..0d21264633 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java index bb78cafa1c..670e0a7192 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/ItemTable.java index 9182d52fcc..94b4547625 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index 313709ab07..4b2cf3b555 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 0f8815bcc4..475f0085d8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index d134fe859e..c57e62c683 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index e131a0f0e5..3359c09da3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 07af46b4a4..339a7e047c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index 1b5d73308d..4ed0600683 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 0f7be781b2..7bc7be8487 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index ba3ab89b07..20d23bc7fc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 03cb8145be..5cba56b98c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -35,9 +35,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 3d21c7ddf0..5f3eb28e8a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ArmorSet.java index 2a57f20a10..6b504526ef 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/CombatFlag.java index e726f912f1..e0487f9079 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 142e7874c0..31885961ce 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java index ec67ca4a4a..5244307c22 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java @@ -45,8 +45,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ShortCuts.java index a9796fbbb7..36f3461010 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TradeList.java index bbafcb1416..bea714862c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java index b3e2469c24..1c5b3588c3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -66,8 +66,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8d7813d677..93970f20a1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -116,12 +116,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java index fa66dfe236..1b015f1bff 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -75,8 +75,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java index da8d5e194c..d6b98b6681 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -231,22 +231,22 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Summon.java index d6d2c3d555..9658fe75ff 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 2dd9a62da6..ed26029abd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index 6d0c4d66fa..2ad4775ebe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b621ac99a1..b2b77ee360 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index 99060558ba..4552b070ca 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index b1b98408e0..55d2f3556b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 29208b2b65..8e5328b099 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index da5ff96580..87cb594bc9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -40,8 +40,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.vip.VipManager; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9f908898ea..ebdbe02899 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index d60e1343b9..1f55ed1bae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 2e75866e00..0b472089a8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index fcd8e14da5..2613a1847b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index bab8b12ab1..9f4fdbdfc9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index a5fea7c6f6..347f281026 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index dc2add2a3a..8c8b2b019d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -130,15 +130,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index 92bce4268b..14cccac24d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 79c69f739d..41f554b9e0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index b86121305d..b18ff0fce9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/Armor.java index a2f1c2d3e6..c2d573ea62 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/Henna.java similarity index 94% rename from L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Henna.java rename to L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/Henna.java index 09fdb7abcb..d029309b0f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Henna.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.HashMap; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index 499de2a7d7..28646ed3de 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java new file mode 100644 index 0000000000..b289fa70ae --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -0,0 +1,300 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.Collection; +import java.util.Objects; + +import org.l2jmobius.gameserver.enums.AttributeType; +import org.l2jmobius.gameserver.model.VariationInstance; +import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * This class contains Item
+ * Use to sort Item of : + *
    + *
  • Armor
    • + *
  • EtcItem
    • + *
  • Weapon
    • + *
+ * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ + */ +public class WarehouseItem +{ + private final ItemTemplate _item; + private final int _object; + private final long _count; + private final int _owner; + private final int _locationSlot; + private final int _enchant; + private final CrystalType _grade; + private final VariationInstance _augmentation; + private final int _customType1; + private final int _customType2; + private final int _mana; + + private byte _elemAtkType = -2; + private int _elemAtkPower = 0; + + private final int[] _elemDefAttr = + { + 0, + 0, + 0, + 0, + 0, + 0 + }; + + private final int[] _enchantOptions; + private final Collection _soulCrystalOptions; + private final Collection _soulCrystalSpecialOptions; + + private final int _time; + + public WarehouseItem(Item item) + { + Objects.requireNonNull(item); + _item = item.getItem(); + _object = item.getObjectId(); + _count = item.getCount(); + _owner = item.getOwnerId(); + _locationSlot = item.getLocationSlot(); + _enchant = item.getEnchantLevel(); + _customType1 = item.getCustomType1(); + _customType2 = item.getCustomType2(); + _grade = item.getItem().getCrystalType(); + _augmentation = item.getAugmentation(); + _mana = item.getMana(); + _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; + _elemAtkType = item.getAttackAttributeType().getClientId(); + _elemAtkPower = item.getAttackAttributePower(); + for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) + { + _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); + } + _enchantOptions = item.getEnchantOptions(); + _soulCrystalOptions = item.getSpecialAbilities(); + _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); + } + + /** + * @return the item. + */ + public ItemTemplate getItem() + { + return _item; + } + + /** + * @return the unique objectId. + */ + public int getObjectId() + { + return _object; + } + + /** + * @return the owner. + */ + public int getOwnerId() + { + return _owner; + } + + /** + * @return the location slot. + */ + public int getLocationSlot() + { + return _locationSlot; + } + + /** + * @return the count. + */ + public long getCount() + { + return _count; + } + + /** + * @return the first type. + */ + public int getType1() + { + return _item.getType1(); + } + + /** + * @return the second type. + */ + public int getType2() + { + return _item.getType2(); + } + + /** + * @return the second type. + */ + public ItemType getItemType() + { + return _item.getItemType(); + } + + /** + * @return the ItemId. + */ + public int getItemId() + { + return _item.getId(); + } + + /** + * @return the part of body used with this item. + */ + public long getBodyPart() + { + return _item.getBodyPart(); + } + + /** + * @return the enchant level. + */ + public int getEnchantLevel() + { + return _enchant; + } + + /** + * @return the item grade + */ + public CrystalType getItemGrade() + { + return _grade; + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + public boolean isWeapon() + { + return (_item instanceof Weapon); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise. + */ + public boolean isArmor() + { + return (_item instanceof Armor); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + public boolean isEtcItem() + { + return (_item instanceof EtcItem); + } + + /** + * @return the name of the item + */ + public String getItemName() + { + return _item.getName(); + } + + /** + * @return the augmentation If. + */ + public VariationInstance getAugmentation() + { + return _augmentation; + } + + /** + * @return the name of the item + */ + public String getName() + { + return _item.getName(); + } + + public int getCustomType1() + { + return _customType1; + } + + public int getCustomType2() + { + return _customType2; + } + + public int getMana() + { + return _mana; + } + + public byte getAttackElementType() + { + return _elemAtkType; + } + + public int getAttackElementPower() + { + return _elemAtkPower; + } + + public int getElementDefAttr(byte i) + { + return _elemDefAttr[i]; + } + + public int[] getEnchantOptions() + { + return _enchantOptions; + } + + public Collection getSoulCrystalOptions() + { + return _soulCrystalOptions; + } + + public Collection getSoulCrystalSpecialOptions() + { + return _soulCrystalSpecialOptions; + } + + public int getTime() + { + return _time; + } + + /** + * @return the name of the item + */ + @Override + public String toString() + { + return _item.toString(); + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/Weapon.java new file mode 100644 index 0000000000..3ae599da0d --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -0,0 +1,311 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.enums.ItemSkillType; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is dedicated to the management of weapons. + */ +public class Weapon extends ItemTemplate +{ + private WeaponType _type; + private boolean _isMagicWeapon; + private int _soulShotCount; + private int _spiritShotCount; + private int _mpConsume; + private int _baseAttackRange; + private int _baseAttackRadius; + private int _baseAttackAngle; + private int _changeWeaponId; + + private int _reducedSoulshot; + private int _reducedSoulshotChance; + + private int _reducedMpConsume; + private int _reducedMpConsumeChance; + + private boolean _isForceEquip; + private boolean _isAttackWeapon; + private boolean _useWeaponSkillsOnly; + + /** + * Constructor for Weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. + */ + public Weapon(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_WEAPON; + _isMagicWeapon = set.getBoolean("is_magic_weapon", false); + _soulShotCount = set.getInt("soulshots", 0); + _spiritShotCount = set.getInt("spiritshots", 0); + _mpConsume = set.getInt("mp_consume", 0); + _baseAttackRange = set.getInt("attack_range", 40); + final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) + { + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + } + else + { + _baseAttackRadius = 40; + _baseAttackAngle = 240; // 360 - 120 + } + + final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); + _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; + _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; + + final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); + _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; + _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; + _changeWeaponId = set.getInt("change_weaponId", 0); + _isForceEquip = set.getBoolean("isForceEquip", false); + _isAttackWeapon = set.getBoolean("isAttackWeapon", true); + _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); + } + + /** + * @return the type of Weapon + */ + @Override + public WeaponType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + @Override + public boolean isWeapon() + { + return true; + } + + /** + * @return {@code true} if the weapon is magic, {@code false} otherwise. + */ + @Override + public boolean isMagicWeapon() + { + return _isMagicWeapon; + } + + /** + * @return the quantity of SoulShot used. + */ + public int getSoulShotCount() + { + return _soulShotCount; + } + + /** + * @return the quantity of SpiritShot used. + */ + public int getSpiritShotCount() + { + return _spiritShotCount; + } + + /** + * @return the reduced quantity of SoultShot used. + */ + public int getReducedSoulShot() + { + return _reducedSoulshot; + } + + /** + * @return the chance to use Reduced SoultShot. + */ + public int getReducedSoulShotChance() + { + return _reducedSoulshotChance; + } + + /** + * @return the MP consumption with the weapon. + */ + public int getMpConsume() + { + return _mpConsume; + } + + public int getBaseAttackRange() + { + return _baseAttackRange; + } + + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + + /** + * @return the reduced MP consumption with the weapon. + */ + public int getReducedMpConsume() + { + return _reducedMpConsume; + } + + /** + * @return the chance to use getReducedMpConsume() + */ + public int getReducedMpConsumeChance() + { + return _reducedMpConsumeChance; + } + + /** + * @return the Id in which weapon this weapon can be changed. + */ + public int getChangeWeaponId() + { + return _changeWeaponId; + } + + /** + * @return {@code true} if the weapon is force equip, {@code false} otherwise. + */ + public boolean isForceEquip() + { + return _isForceEquip; + } + + /** + * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. + */ + public boolean isAttackWeapon() + { + return _isAttackWeapon; + } + + /** + * @return {@code true} if the weapon is skills only, {@code false} otherwise. + */ + public boolean useWeaponSkillsOnly() + { + return _useWeaponSkillsOnly; + } + + /** + * @param caster the Creature pointing out the caster + * @param target the Creature pointing out the target + * @param trigger + * @param type + */ + public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) + { + forEachSkill(type, holder -> + { + final Skill skill = holder.getSkill(); + if (Rnd.get(100) >= holder.getChance()) + { + return; + } + + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // Trigger only if both are good or bad magic. + if (trigger.isBad() != skill.isBad()) + { + return; + } + + // No Trigger if not Magic Skill or is toggle + if (trigger.isMagic() != skill.isMagic()) + { + return; + } + + // No Trigger if skill is toggle + if (trigger.isToggle()) + { + return; + } + + if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) + { + return; + } + } + + // Skill condition not met + if (!skill.checkCondition(caster, target)) + { + return; + } + + skill.activateSkill(caster, target); + + // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // notify quests of a skill use + if (caster.isPlayer()) + { + World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); + } + if (caster.isPlayer()) + { + final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); + sm.addSkillName(skill); + caster.sendPacket(sm); + } + } + }); + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java new file mode 100644 index 0000000000..610e720125 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -0,0 +1,558 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.network.SystemMessageId; + +/** + * @author UnAfraid + */ +public class AppearanceStone +{ + private final int _id; + private final int _cost; + private final int _visualId; + private final long _lifeTime; + private final AppearanceType _type; + private final WeaponType _weaponType; + private final ArmorType _armorType; + private final AppearanceHandType _handType; + private final AppearanceMagicType _magicType; + private List _crystalTypes; + private List _targetTypes; + private List _bodyParts; + private List _races; + private List _racesNot; + private List _allVisualIds; + + public AppearanceStone(StatSet set) + { + _id = set.getInt("id"); + _visualId = set.getInt("visualId", 0); + _cost = set.getInt("cost", 0); + _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); + _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); + _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); + _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); + _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); + _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); + + final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); + if (targetType != AppearanceTargetType.NONE) + { + addTargetType(targetType); + } + + // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. + final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); + + // If no crystal type is defined, we must add all defaults. + if (crystalType == null) + { + switch (targetType) + { + case ACCESSORY: + case ALL: + { + addCrystalType(CrystalType.NONE); + // fallthrough + } + case WEAPON: + case ARMOR: + { + for (CrystalType cryType : CrystalType.values()) + { + if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) + { + addCrystalType(cryType); + } + } + } + } + } + else + { + addCrystalType(crystalType); + } + + final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); + if (bodyPart != ItemTemplate.SLOT_NONE) + { + addBodyPart(bodyPart); + } + + final Race race = set.getEnum("race", Race.class, Race.NONE); + if (race != Race.NONE) + { + addRace(race); + } + + final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); + if (raceNot != Race.NONE) + { + addRaceNot(raceNot); + } + } + + public int getId() + { + return _id; + } + + public int getVisualId() + { + return _visualId; + } + + public int getCost() + { + return _cost; + } + + public long getLifeTime() + { + return _lifeTime; + } + + public AppearanceType getType() + { + return _type; + } + + public WeaponType getWeaponType() + { + return _weaponType; + } + + public ArmorType getArmorType() + { + return _armorType; + } + + public AppearanceHandType getHandType() + { + return _handType; + } + + public AppearanceMagicType getMagicType() + { + return _magicType; + } + + public void addCrystalType(CrystalType type) + { + if (_crystalTypes == null) + { + _crystalTypes = new ArrayList<>(); + } + _crystalTypes.add(type); + } + + public List getCrystalTypes() + { + return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); + } + + public void addTargetType(AppearanceTargetType type) + { + if (_targetTypes == null) + { + _targetTypes = new ArrayList<>(); + } + _targetTypes.add(type); + } + + public List getTargetTypes() + { + return _targetTypes != null ? _targetTypes : Collections.emptyList(); + } + + public void addBodyPart(long part) + { + if (_bodyParts == null) + { + _bodyParts = new ArrayList<>(); + } + _bodyParts.add(part); + } + + public void addVisualId(AppearanceHolder appearanceHolder) + { + if (_allVisualIds == null) + { + _allVisualIds = new ArrayList<>(); + } + _allVisualIds.add(appearanceHolder); + } + + public List getVisualIds() + { + return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); + } + + public List getBodyParts() + { + return _bodyParts != null ? _bodyParts : Collections.emptyList(); + } + + public void addRace(Race race) + { + if (_races == null) + { + _races = new ArrayList<>(); + } + _races.add(race); + } + + public List getRaces() + { + return _races != null ? _races : Collections.emptyList(); + } + + public void addRaceNot(Race race) + { + if (_racesNot == null) + { + _racesNot = new ArrayList<>(); + } + _racesNot.add(race); + } + + public List getRacesNot() + { + return _racesNot != null ? _racesNot : Collections.emptyList(); + } + + /** + * @param player the actor requesting to use this appearance. + * @param targetItem the item to be modified with this appearance. + * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. + */ + public boolean checkConditions(Player player, Item targetItem) + { + if (targetItem == null) + { + return false; + } + + if (getTargetTypes().isEmpty()) + { + return false; + } + + if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); + return false; + } + + switch (_type) + { + case RESTORE: + { + if (targetItem.getVisualId() == 0) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); + return false; + } + + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + default: + { + // Seems like in retail item with already changed appearance, can be changed again without being restored. + + final AppearanceTargetType targetType = getTargetTypes().get(0); + switch (targetType) + { + case NONE: + { + return false; + } + case WEAPON: + { + if (!targetItem.isWeapon()) + { + player.sendPacket(SystemMessageId.WEAPONS_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ARMOR: + { + if (!targetItem.isArmor()) + { + player.sendPacket(SystemMessageId.ARMOR_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ACCESSORY: + { + if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + { + player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); + return false; + } + break; + } + case ALL: + { + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (findVisualChange(targetItem) == null) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + return true; + } + } + break; + } + } + + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (_weaponType != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) + { + if (_weaponType != WeaponType.CROSSBOW) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + } + + switch (_handType) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + } + + switch (_magicType) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + if (_armorType != ArmorType.NONE) + { + switch (_armorType) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + return true; + } + + public AppearanceHolder findVisualChange(Item targetItem) + { + for (AppearanceHolder holder : _allVisualIds) + { + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + { + continue; + } + + if (holder.getWeaponType() != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) + { + if (holder.getWeaponType() != WeaponType.CROSSBOW) + { + continue; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + continue; + } + } + + switch (holder.getHandType()) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + continue; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + continue; + } + break; + } + } + + switch (holder.getMagicType()) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + continue; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + continue; + } + } + } + } + + if (holder.getArmorType() != ArmorType.NONE) + { + switch (holder.getArmorType()) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + continue; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + continue; + } + } + } + } + return holder; + } + return null; + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java new file mode 100644 index 0000000000..6f73983c0e --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -0,0 +1,65 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import java.util.EnumMap; +import java.util.Map; + +import org.l2jmobius.gameserver.model.StatSet; + +/** + * @author UnAfraid + */ +public class CombinationItem +{ + private final int _itemOne; + private final int _itemTwo; + private final int _chance; + private final Map _rewards = new EnumMap<>(CombinationItemType.class); + + public CombinationItem(StatSet set) + { + _itemOne = set.getInt("one"); + _itemTwo = set.getInt("two"); + _chance = set.getInt("chance"); + } + + public int getItemOne() + { + return _itemOne; + } + + public int getItemTwo() + { + return _itemTwo; + } + + public int getChance() + { + return _chance; + } + + public void addReward(CombinationItemReward item) + { + _rewards.put(item.getType(), item); + } + + public CombinationItemReward getReward(CombinationItemType type) + { + return _rewards.get(type); + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java new file mode 100644 index 0000000000..8890655085 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -0,0 +1,210 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.logging.Logger; + +import org.l2jmobius.commons.util.CommonUtil; +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public abstract class AbstractEnchantItem +{ + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); + + private static final ItemType[] ENCHANT_TYPES = new ItemType[] + { + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + EtcItemType.BLESS_ENCHT_AM, + EtcItemType.BLESS_ENCHT_AM_DOWN, + EtcItemType.BLESS_ENCHT_WP, + EtcItemType.ENCHT_AM, + EtcItemType.ENCHT_WP, + EtcItemType.GIANT_ENCHT_AM, + EtcItemType.GIANT_ENCHT_WP, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + }; + + private final int _id; + private final CrystalType _grade; + private final int _minEnchantLevel; + private final int _maxEnchantLevel; + private final int _safeEnchantLevel; + private final int _randomEnchantMin; + private final int _randomEnchantMax; + private final double _bonusRate; + + public AbstractEnchantItem(StatSet set) + { + _id = set.getInt("id"); + if (getItem() == null) + { + throw new NullPointerException(); + } + else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) + { + throw new IllegalAccessError(); + } + _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); + _minEnchantLevel = set.getInt("minEnchant", 0); + _maxEnchantLevel = set.getInt("maxEnchant", 127); + _safeEnchantLevel = set.getInt("safeEnchant", 0); + _randomEnchantMin = set.getInt("randomEnchantMin", 1); + _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); + _bonusRate = set.getDouble("bonusRate", 0); + } + + /** + * @return id of current item + */ + public int getId() + { + return _id; + } + + /** + * @return bonus chance that would be added + */ + public double getBonusRate() + { + return _bonusRate; + } + + /** + * @return {@link ItemTemplate} current item/scroll + */ + public ItemTemplate getItem() + { + return ItemTable.getInstance().getTemplate(_id); + } + + /** + * @return grade of the item/scroll. + */ + public CrystalType getGrade() + { + return _grade; + } + + /** + * @return {@code true} if scroll is for weapon, {@code false} for armor + */ + public abstract boolean isWeapon(); + + /** + * @return the minimum enchant level that this scroll/item can be used with + */ + public int getMinEnchantLevel() + { + return _minEnchantLevel; + } + + /** + * @return the maximum enchant level that this scroll/item can be used with + */ + public int getMaxEnchantLevel() + { + return _maxEnchantLevel; + } + + /** + * @return the safe enchant level of this scroll/item + */ + public int getSafeEnchant() + { + return _safeEnchantLevel; + } + + /** + * @return the minimum random enchant level of this scroll/item + */ + public int getRandomEnchantMin() + { + return _randomEnchantMin; + } + + /** + * @return the maximum random enchant level of this scroll/item + */ + public int getRandomEnchantMax() + { + return _randomEnchantMax; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem + * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise + */ + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if (itemToEnchant == null) + { + return false; + } + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + { + return false; + } + else if (!isValidItemType(itemToEnchant.getItem().getType2())) + { + return false; + } + else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) + { + return false; + } + else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + { + return false; + } + return true; + } + + /** + * @param type2 + * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise + */ + private boolean isValidItemType(int type2) + { + if (type2 == ItemTemplate.TYPE2_WEAPON) + { + return isWeapon(); + } + else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) + { + return !isWeapon(); + } + return false; + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..1099b77054 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private long _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(long slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 93% rename from L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index e2c2f6ad68..9a80e104b0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.stats.Stat; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java new file mode 100644 index 0000000000..bfe1c295da --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -0,0 +1,57 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public class EnchantSupportItem extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isGiant; + private final ItemType type; + + public EnchantSupportItem(StatSet set) + { + super(set); + type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + public boolean isBlessed() + { + return _isBlessed; + } + + public boolean isGiant() + { + return _isGiant; + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java index b196da7407..659d9f04bf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -72,15 +72,15 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java new file mode 100644 index 0000000000..c8a309674f --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -0,0 +1,88 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Crystal Type enumerated. + * @author Adry_85 + */ +public enum CrystalType +{ + NONE(0, 0, 0, 0), + D(1, 1458, 11, 90), + C(2, 1459, 6, 45), + B(3, 1460, 11, 67), + A(4, 1461, 20, 145), + S(5, 1462, 25, 250), + S80(6, 1462, 25, 250), + S84(7, 1462, 25, 250), + R(8, 17371, 30, 500), + R95(9, 17371, 30, 500), + R99(10, 17371, 30, 500), + EVENT(11, 0, 0, 0); + + private final int _level; + private final int _crystalId; + private final int _crystalEnchantBonusArmor; + private final int _crystalEnchantBonusWeapon; + + CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) + { + _level = level; + _crystalId = crystalId; + _crystalEnchantBonusArmor = crystalEnchantBonusArmor; + _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; + } + + /** + * Gets the crystal type ID. + * @return the crystal type ID + */ + public int getLevel() + { + return _level; + } + + /** + * Gets the item ID of the crystal. + * @return the item ID of the crystal + */ + public int getCrystalId() + { + return _crystalId; + } + + public int getCrystalEnchantBonusArmor() + { + return _crystalEnchantBonusArmor; + } + + public int getCrystalEnchantBonusWeapon() + { + return _crystalEnchantBonusWeapon; + } + + public boolean isGreater(CrystalType crystalType) + { + return getLevel() > crystalType.getLevel(); + } + + public boolean isLesser(CrystalType crystalType) + { + return getLevel() < crystalType.getLevel(); + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java new file mode 100644 index 0000000000..834b0c3996 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -0,0 +1,105 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * EtcItem Type enumerated. + */ +public enum EtcItemType implements ItemType +{ + NONE, + SCROLL, + ARROW, + POTION, + SPELLBOOK, + RECIPE, + MATERIAL, + PET_COLLAR, + CASTLE_GUARD, + DYE, + SEED, + SEED2, + HARVEST, + LOTTO, + RACE_TICKET, + TICKET_OF_LORD, + LURE, + CROP, + MATURECROP, + ENCHT_WP, + ENCHT_AM, + GIANT_ENCHT_WP, + GIANT_ENCHT_AM, + BLESS_ENCHT_WP, + BLESS_ENCHT_AM, + BLESS_ENCHT_AM_DOWN, + COUPON, + ELIXIR, + ENCHT_ATTR, + ENCHT_ATTR_CURSED, + BOLT, + ENCHT_ATTR_INC_PROP_ENCHT_WP, + ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_RUNE, + ENCHT_ATTRT_RUNE_SELECT, + TELEPORTBOOKMARK, + CHANGE_ATTR, + SOULSHOT, + SHAPE_SHIFTING_WP, + BLESS_SHAPE_SHIFTING_WP, + // EIT_RESTORE_SHAPE_SHIFTING_WP, + SHAPE_SHIFTING_WP_FIXED, + SHAPE_SHIFTING_AM, + BLESS_SHAPE_SHIFTING_AM, + SHAPE_SHIFTING_AM_FIXED, + SHAPE_SHIFTING_HAIRACC, + BLESS_SHAPE_SHIFTING_HAIRACC, + SHAPE_SHIFTING_HAIRACC_FIXED, + RESTORE_SHAPE_SHIFTING_WP, + RESTORE_SHAPE_SHIFTING_AM, + RESTORE_SHAPE_SHIFTING_HAIRACC, + RESTORE_SHAPE_SHIFTING_ALLITEM, + BLESS_INC_PROP_ENCHT_WP, + BLESS_INC_PROP_ENCHT_AM, + CARD_EVENT, + SHAPE_SHIFTING_ALLITEM_FIXED, + MULTI_ENCHT_WP, + MULTI_ENCHT_AM, + MULTI_INC_PROB_ENCHT_WP, + MULTI_INC_PROB_ENCHT_AM, + SOUL_CRYSTAL, + ENSOUL_STONE; + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return 0; + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 8323d4bdc7..06760564d7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index c0a8c1156a..68e0eb9b66 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -54,14 +54,14 @@ import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 6f6d11a97d..c8e13e1e2c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java deleted file mode 100644 index 5618132356..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ /dev/null @@ -1,300 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.Collection; -import java.util.Objects; - -import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * This class contains Item
- * Use to sort Item of : - *
    - *
  • Armor
    • - *
  • EtcItem
    • - *
  • Weapon
    • - *
- * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ - */ -public class WarehouseItem -{ - private final ItemTemplate _item; - private final int _object; - private final long _count; - private final int _owner; - private final int _locationSlot; - private final int _enchant; - private final CrystalType _grade; - private final VariationInstance _augmentation; - private final int _customType1; - private final int _customType2; - private final int _mana; - - private byte _elemAtkType = -2; - private int _elemAtkPower = 0; - - private final int[] _elemDefAttr = - { - 0, - 0, - 0, - 0, - 0, - 0 - }; - - private final int[] _enchantOptions; - private final Collection _soulCrystalOptions; - private final Collection _soulCrystalSpecialOptions; - - private final int _time; - - public WarehouseItem(Item item) - { - Objects.requireNonNull(item); - _item = item.getItem(); - _object = item.getObjectId(); - _count = item.getCount(); - _owner = item.getOwnerId(); - _locationSlot = item.getLocationSlot(); - _enchant = item.getEnchantLevel(); - _customType1 = item.getCustomType1(); - _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); - _augmentation = item.getAugmentation(); - _mana = item.getMana(); - _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; - _elemAtkType = item.getAttackAttributeType().getClientId(); - _elemAtkPower = item.getAttackAttributePower(); - for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) - { - _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); - } - _enchantOptions = item.getEnchantOptions(); - _soulCrystalOptions = item.getSpecialAbilities(); - _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); - } - - /** - * @return the item. - */ - public ItemTemplate getItem() - { - return _item; - } - - /** - * @return the unique objectId. - */ - public int getObjectId() - { - return _object; - } - - /** - * @return the owner. - */ - public int getOwnerId() - { - return _owner; - } - - /** - * @return the location slot. - */ - public int getLocationSlot() - { - return _locationSlot; - } - - /** - * @return the count. - */ - public long getCount() - { - return _count; - } - - /** - * @return the first type. - */ - public int getType1() - { - return _item.getType1(); - } - - /** - * @return the second type. - */ - public int getType2() - { - return _item.getType2(); - } - - /** - * @return the second type. - */ - public ItemType getItemType() - { - return _item.getItemType(); - } - - /** - * @return the ItemId. - */ - public int getItemId() - { - return _item.getId(); - } - - /** - * @return the part of body used with this item. - */ - public long getBodyPart() - { - return _item.getBodyPart(); - } - - /** - * @return the enchant level. - */ - public int getEnchantLevel() - { - return _enchant; - } - - /** - * @return the item grade - */ - public CrystalType getItemGrade() - { - return _grade; - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - public boolean isWeapon() - { - return (_item instanceof Weapon); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise. - */ - public boolean isArmor() - { - return (_item instanceof Armor); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - public boolean isEtcItem() - { - return (_item instanceof EtcItem); - } - - /** - * @return the name of the item - */ - public String getItemName() - { - return _item.getName(); - } - - /** - * @return the augmentation If. - */ - public VariationInstance getAugmentation() - { - return _augmentation; - } - - /** - * @return the name of the item - */ - public String getName() - { - return _item.getName(); - } - - public int getCustomType1() - { - return _customType1; - } - - public int getCustomType2() - { - return _customType2; - } - - public int getMana() - { - return _mana; - } - - public byte getAttackElementType() - { - return _elemAtkType; - } - - public int getAttackElementPower() - { - return _elemAtkPower; - } - - public int getElementDefAttr(byte i) - { - return _elemDefAttr[i]; - } - - public int[] getEnchantOptions() - { - return _enchantOptions; - } - - public Collection getSoulCrystalOptions() - { - return _soulCrystalOptions; - } - - public Collection getSoulCrystalSpecialOptions() - { - return _soulCrystalSpecialOptions; - } - - public int getTime() - { - return _time; - } - - /** - * @return the name of the item - */ - @Override - public String toString() - { - return _item.toString(); - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Weapon.java deleted file mode 100644 index 85bb22d23b..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is dedicated to the management of weapons. - */ -public class Weapon extends ItemTemplate -{ - private WeaponType _type; - private boolean _isMagicWeapon; - private int _soulShotCount; - private int _spiritShotCount; - private int _mpConsume; - private int _baseAttackRange; - private int _baseAttackRadius; - private int _baseAttackAngle; - private int _changeWeaponId; - - private int _reducedSoulshot; - private int _reducedSoulshotChance; - - private int _reducedMpConsume; - private int _reducedMpConsumeChance; - - private boolean _isForceEquip; - private boolean _isAttackWeapon; - private boolean _useWeaponSkillsOnly; - - /** - * Constructor for Weapon. - * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. - */ - public Weapon(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_WEAPON; - _isMagicWeapon = set.getBoolean("is_magic_weapon", false); - _soulShotCount = set.getInt("soulshots", 0); - _spiritShotCount = set.getInt("spiritshots", 0); - _mpConsume = set.getInt("mp_consume", 0); - _baseAttackRange = set.getInt("attack_range", 40); - final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) - { - _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); - } - else - { - _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 - } - - final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); - _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; - _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; - - final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); - _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; - _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; - _changeWeaponId = set.getInt("change_weaponId", 0); - _isForceEquip = set.getBoolean("isForceEquip", false); - _isAttackWeapon = set.getBoolean("isAttackWeapon", true); - _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); - } - - /** - * @return the type of Weapon - */ - @Override - public WeaponType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - @Override - public boolean isWeapon() - { - return true; - } - - /** - * @return {@code true} if the weapon is magic, {@code false} otherwise. - */ - @Override - public boolean isMagicWeapon() - { - return _isMagicWeapon; - } - - /** - * @return the quantity of SoulShot used. - */ - public int getSoulShotCount() - { - return _soulShotCount; - } - - /** - * @return the quantity of SpiritShot used. - */ - public int getSpiritShotCount() - { - return _spiritShotCount; - } - - /** - * @return the reduced quantity of SoultShot used. - */ - public int getReducedSoulShot() - { - return _reducedSoulshot; - } - - /** - * @return the chance to use Reduced SoultShot. - */ - public int getReducedSoulShotChance() - { - return _reducedSoulshotChance; - } - - /** - * @return the MP consumption with the weapon. - */ - public int getMpConsume() - { - return _mpConsume; - } - - public int getBaseAttackRange() - { - return _baseAttackRange; - } - - public int getBaseAttackRadius() - { - return _baseAttackRadius; - } - - public int getBaseAttackAngle() - { - return _baseAttackAngle; - } - - /** - * @return the reduced MP consumption with the weapon. - */ - public int getReducedMpConsume() - { - return _reducedMpConsume; - } - - /** - * @return the chance to use getReducedMpConsume() - */ - public int getReducedMpConsumeChance() - { - return _reducedMpConsumeChance; - } - - /** - * @return the Id in which weapon this weapon can be changed. - */ - public int getChangeWeaponId() - { - return _changeWeaponId; - } - - /** - * @return {@code true} if the weapon is force equip, {@code false} otherwise. - */ - public boolean isForceEquip() - { - return _isForceEquip; - } - - /** - * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. - */ - public boolean isAttackWeapon() - { - return _isAttackWeapon; - } - - /** - * @return {@code true} if the weapon is skills only, {@code false} otherwise. - */ - public boolean useWeaponSkillsOnly() - { - return _useWeaponSkillsOnly; - } - - /** - * @param caster the Creature pointing out the caster - * @param target the Creature pointing out the target - * @param trigger - * @param type - */ - public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) - { - forEachSkill(type, holder -> - { - final Skill skill = holder.getSkill(); - if (Rnd.get(100) >= holder.getChance()) - { - return; - } - - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // Trigger only if both are good or bad magic. - if (trigger.isBad() != skill.isBad()) - { - return; - } - - // No Trigger if not Magic Skill or is toggle - if (trigger.isMagic() != skill.isMagic()) - { - return; - } - - // No Trigger if skill is toggle - if (trigger.isToggle()) - { - return; - } - - if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) - { - return; - } - } - - // Skill condition not met - if (!skill.checkCondition(caster, target)) - { - return; - } - - skill.activateSkill(caster, target); - - // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // notify quests of a skill use - if (caster.isPlayer()) - { - World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); - } - if (caster.isPlayer()) - { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); - sm.addSkillName(skill); - caster.sendPacket(sm); - } - } - }); - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java deleted file mode 100644 index a568389489..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ /dev/null @@ -1,558 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author UnAfraid - */ -public class AppearanceStone -{ - private final int _id; - private final int _cost; - private final int _visualId; - private final long _lifeTime; - private final AppearanceType _type; - private final WeaponType _weaponType; - private final ArmorType _armorType; - private final AppearanceHandType _handType; - private final AppearanceMagicType _magicType; - private List _crystalTypes; - private List _targetTypes; - private List _bodyParts; - private List _races; - private List _racesNot; - private List _allVisualIds; - - public AppearanceStone(StatSet set) - { - _id = set.getInt("id"); - _visualId = set.getInt("visualId", 0); - _cost = set.getInt("cost", 0); - _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); - _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); - _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); - _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); - _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); - _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); - - final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); - if (targetType != AppearanceTargetType.NONE) - { - addTargetType(targetType); - } - - // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. - final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); - - // If no crystal type is defined, we must add all defaults. - if (crystalType == null) - { - switch (targetType) - { - case ACCESSORY: - case ALL: - { - addCrystalType(CrystalType.NONE); - // fallthrough - } - case WEAPON: - case ARMOR: - { - for (CrystalType cryType : CrystalType.values()) - { - if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) - { - addCrystalType(cryType); - } - } - } - } - } - else - { - addCrystalType(crystalType); - } - - final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); - if (bodyPart != ItemTemplate.SLOT_NONE) - { - addBodyPart(bodyPart); - } - - final Race race = set.getEnum("race", Race.class, Race.NONE); - if (race != Race.NONE) - { - addRace(race); - } - - final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); - if (raceNot != Race.NONE) - { - addRaceNot(raceNot); - } - } - - public int getId() - { - return _id; - } - - public int getVisualId() - { - return _visualId; - } - - public int getCost() - { - return _cost; - } - - public long getLifeTime() - { - return _lifeTime; - } - - public AppearanceType getType() - { - return _type; - } - - public WeaponType getWeaponType() - { - return _weaponType; - } - - public ArmorType getArmorType() - { - return _armorType; - } - - public AppearanceHandType getHandType() - { - return _handType; - } - - public AppearanceMagicType getMagicType() - { - return _magicType; - } - - public void addCrystalType(CrystalType type) - { - if (_crystalTypes == null) - { - _crystalTypes = new ArrayList<>(); - } - _crystalTypes.add(type); - } - - public List getCrystalTypes() - { - return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); - } - - public void addTargetType(AppearanceTargetType type) - { - if (_targetTypes == null) - { - _targetTypes = new ArrayList<>(); - } - _targetTypes.add(type); - } - - public List getTargetTypes() - { - return _targetTypes != null ? _targetTypes : Collections.emptyList(); - } - - public void addBodyPart(long part) - { - if (_bodyParts == null) - { - _bodyParts = new ArrayList<>(); - } - _bodyParts.add(part); - } - - public void addVisualId(AppearanceHolder appearanceHolder) - { - if (_allVisualIds == null) - { - _allVisualIds = new ArrayList<>(); - } - _allVisualIds.add(appearanceHolder); - } - - public List getVisualIds() - { - return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); - } - - public List getBodyParts() - { - return _bodyParts != null ? _bodyParts : Collections.emptyList(); - } - - public void addRace(Race race) - { - if (_races == null) - { - _races = new ArrayList<>(); - } - _races.add(race); - } - - public List getRaces() - { - return _races != null ? _races : Collections.emptyList(); - } - - public void addRaceNot(Race race) - { - if (_racesNot == null) - { - _racesNot = new ArrayList<>(); - } - _racesNot.add(race); - } - - public List getRacesNot() - { - return _racesNot != null ? _racesNot : Collections.emptyList(); - } - - /** - * @param player the actor requesting to use this appearance. - * @param targetItem the item to be modified with this appearance. - * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. - */ - public boolean checkConditions(Player player, Item targetItem) - { - if (targetItem == null) - { - return false; - } - - if (getTargetTypes().isEmpty()) - { - return false; - } - - if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); - return false; - } - - switch (_type) - { - case RESTORE: - { - if (targetItem.getVisualId() == 0) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); - return false; - } - - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - default: - { - // Seems like in retail item with already changed appearance, can be changed again without being restored. - - final AppearanceTargetType targetType = getTargetTypes().get(0); - switch (targetType) - { - case NONE: - { - return false; - } - case WEAPON: - { - if (!targetItem.isWeapon()) - { - player.sendPacket(SystemMessageId.WEAPONS_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ARMOR: - { - if (!targetItem.isArmor()) - { - player.sendPacket(SystemMessageId.ARMOR_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ACCESSORY: - { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) - { - player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); - return false; - } - break; - } - case ALL: - { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (findVisualChange(targetItem) == null) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - return true; - } - } - break; - } - } - - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (_weaponType != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) - { - if (_weaponType != WeaponType.CROSSBOW) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - } - - switch (_handType) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - } - - switch (_magicType) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - if (_armorType != ArmorType.NONE) - { - switch (_armorType) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - return true; - } - - public AppearanceHolder findVisualChange(Item targetItem) - { - for (AppearanceHolder holder : _allVisualIds) - { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) - { - continue; - } - - if (holder.getWeaponType() != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) - { - if (holder.getWeaponType() != WeaponType.CROSSBOW) - { - continue; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - continue; - } - } - - switch (holder.getHandType()) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - continue; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - continue; - } - break; - } - } - - switch (holder.getMagicType()) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - continue; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - continue; - } - } - } - } - - if (holder.getArmorType() != ArmorType.NONE) - { - switch (holder.getArmorType()) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - continue; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - continue; - } - } - } - } - return holder; - } - return null; - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java deleted file mode 100644 index a2897ba911..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import java.util.EnumMap; -import java.util.Map; - -import org.l2jmobius.gameserver.model.StatSet; - -/** - * @author UnAfraid - */ -public class CombinationItem -{ - private final int _itemOne; - private final int _itemTwo; - private final int _chance; - private final Map _rewards = new EnumMap<>(CombinationItemType.class); - - public CombinationItem(StatSet set) - { - _itemOne = set.getInt("one"); - _itemTwo = set.getInt("two"); - _chance = set.getInt("chance"); - } - - public int getItemOne() - { - return _itemOne; - } - - public int getItemTwo() - { - return _itemTwo; - } - - public int getChance() - { - return _chance; - } - - public void addReward(CombinationItemReward item) - { - _rewards.put(item.getType(), item); - } - - public CombinationItemReward getReward(CombinationItemType type) - { - return _rewards.get(type); - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java deleted file mode 100644 index a09b01d571..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.logging.Logger; - -import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public abstract class AbstractEnchantItem -{ - protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); - - private static final ItemType[] ENCHANT_TYPES = new ItemType[] - { - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - EtcItemType.BLESS_ENCHT_AM, - EtcItemType.BLESS_ENCHT_AM_DOWN, - EtcItemType.BLESS_ENCHT_WP, - EtcItemType.ENCHT_AM, - EtcItemType.ENCHT_WP, - EtcItemType.GIANT_ENCHT_AM, - EtcItemType.GIANT_ENCHT_WP, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - }; - - private final int _id; - private final CrystalType _grade; - private final int _minEnchantLevel; - private final int _maxEnchantLevel; - private final int _safeEnchantLevel; - private final int _randomEnchantMin; - private final int _randomEnchantMax; - private final double _bonusRate; - - public AbstractEnchantItem(StatSet set) - { - _id = set.getInt("id"); - if (getItem() == null) - { - throw new NullPointerException(); - } - else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) - { - throw new IllegalAccessError(); - } - _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); - _minEnchantLevel = set.getInt("minEnchant", 0); - _maxEnchantLevel = set.getInt("maxEnchant", 127); - _safeEnchantLevel = set.getInt("safeEnchant", 0); - _randomEnchantMin = set.getInt("randomEnchantMin", 1); - _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); - _bonusRate = set.getDouble("bonusRate", 0); - } - - /** - * @return id of current item - */ - public int getId() - { - return _id; - } - - /** - * @return bonus chance that would be added - */ - public double getBonusRate() - { - return _bonusRate; - } - - /** - * @return {@link ItemTemplate} current item/scroll - */ - public ItemTemplate getItem() - { - return ItemTable.getInstance().getTemplate(_id); - } - - /** - * @return grade of the item/scroll. - */ - public CrystalType getGrade() - { - return _grade; - } - - /** - * @return {@code true} if scroll is for weapon, {@code false} for armor - */ - public abstract boolean isWeapon(); - - /** - * @return the minimum enchant level that this scroll/item can be used with - */ - public int getMinEnchantLevel() - { - return _minEnchantLevel; - } - - /** - * @return the maximum enchant level that this scroll/item can be used with - */ - public int getMaxEnchantLevel() - { - return _maxEnchantLevel; - } - - /** - * @return the safe enchant level of this scroll/item - */ - public int getSafeEnchant() - { - return _safeEnchantLevel; - } - - /** - * @return the minimum random enchant level of this scroll/item - */ - public int getRandomEnchantMin() - { - return _randomEnchantMin; - } - - /** - * @return the maximum random enchant level of this scroll/item - */ - public int getRandomEnchantMax() - { - return _randomEnchantMax; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem - * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise - */ - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if (itemToEnchant == null) - { - return false; - } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) - { - return false; - } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) - { - return false; - } - else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) - { - return false; - } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) - { - return false; - } - return true; - } - - /** - * @param type2 - * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise - */ - private boolean isValidItemType(int type2) - { - if (type2 == ItemTemplate.TYPE2_WEAPON) - { - return isWeapon(); - } - else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) - { - return !isWeapon(); - } - return false; - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fe698d8e2a..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private long _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(long slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java deleted file mode 100644 index 13d6b5a2ee..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public class EnchantSupportItem extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isGiant; - private final ItemType type; - - public EnchantSupportItem(StatSet set) - { - super(set); - type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - public boolean isBlessed() - { - return _isBlessed; - } - - public boolean isGiant() - { - return _isGiant; - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java deleted file mode 100644 index d059efd025..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Crystal Type enumerated. - * @author Adry_85 - */ -public enum CrystalType -{ - NONE(0, 0, 0, 0), - D(1, 1458, 11, 90), - C(2, 1459, 6, 45), - B(3, 1460, 11, 67), - A(4, 1461, 20, 145), - S(5, 1462, 25, 250), - S80(6, 1462, 25, 250), - S84(7, 1462, 25, 250), - R(8, 17371, 30, 500), - R95(9, 17371, 30, 500), - R99(10, 17371, 30, 500), - EVENT(11, 0, 0, 0); - - private final int _level; - private final int _crystalId; - private final int _crystalEnchantBonusArmor; - private final int _crystalEnchantBonusWeapon; - - CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) - { - _level = level; - _crystalId = crystalId; - _crystalEnchantBonusArmor = crystalEnchantBonusArmor; - _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; - } - - /** - * Gets the crystal type ID. - * @return the crystal type ID - */ - public int getLevel() - { - return _level; - } - - /** - * Gets the item ID of the crystal. - * @return the item ID of the crystal - */ - public int getCrystalId() - { - return _crystalId; - } - - public int getCrystalEnchantBonusArmor() - { - return _crystalEnchantBonusArmor; - } - - public int getCrystalEnchantBonusWeapon() - { - return _crystalEnchantBonusWeapon; - } - - public boolean isGreater(CrystalType crystalType) - { - return getLevel() > crystalType.getLevel(); - } - - public boolean isLesser(CrystalType crystalType) - { - return getLevel() < crystalType.getLevel(); - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java deleted file mode 100644 index b352bd7fc0..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * EtcItem Type enumerated. - */ -public enum EtcItemType implements ItemType -{ - NONE, - SCROLL, - ARROW, - POTION, - SPELLBOOK, - RECIPE, - MATERIAL, - PET_COLLAR, - CASTLE_GUARD, - DYE, - SEED, - SEED2, - HARVEST, - LOTTO, - RACE_TICKET, - TICKET_OF_LORD, - LURE, - CROP, - MATURECROP, - ENCHT_WP, - ENCHT_AM, - GIANT_ENCHT_WP, - GIANT_ENCHT_AM, - BLESS_ENCHT_WP, - BLESS_ENCHT_AM, - BLESS_ENCHT_AM_DOWN, - COUPON, - ELIXIR, - ENCHT_ATTR, - ENCHT_ATTR_CURSED, - BOLT, - ENCHT_ATTR_INC_PROP_ENCHT_WP, - ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_RUNE, - ENCHT_ATTRT_RUNE_SELECT, - TELEPORTBOOKMARK, - CHANGE_ATTR, - SOULSHOT, - SHAPE_SHIFTING_WP, - BLESS_SHAPE_SHIFTING_WP, - // EIT_RESTORE_SHAPE_SHIFTING_WP, - SHAPE_SHIFTING_WP_FIXED, - SHAPE_SHIFTING_AM, - BLESS_SHAPE_SHIFTING_AM, - SHAPE_SHIFTING_AM_FIXED, - SHAPE_SHIFTING_HAIRACC, - BLESS_SHAPE_SHIFTING_HAIRACC, - SHAPE_SHIFTING_HAIRACC_FIXED, - RESTORE_SHAPE_SHIFTING_WP, - RESTORE_SHAPE_SHIFTING_AM, - RESTORE_SHAPE_SHIFTING_HAIRACC, - RESTORE_SHAPE_SHIFTING_ALLITEM, - BLESS_INC_PROP_ENCHT_WP, - BLESS_INC_PROP_ENCHT_AM, - CARD_EVENT, - SHAPE_SHIFTING_ALLITEM_FIXED, - MULTI_ENCHT_WP, - MULTI_ENCHT_AM, - MULTI_INC_PROB_ENCHT_WP, - MULTI_INC_PROB_ENCHT_AM, - SOUL_CRYSTAL, - ENSOUL_STONE; - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return 0; - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c807e1298e..0fcb8c33e4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 5bf10abc0f..7929fbbe60 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java index 7d30237cb1..d9c41811d2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java index 80eec709d8..1e18bcb9ad 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 527e0b0938..f93380fc15 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 54907880aa..63f20c77b2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -39,11 +39,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index ec7537f935..4c7fa317a0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 98ad03f40d..5e9d4175d5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 38a7116383..ff0ad75b8a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index c1cac0d20a..02c4f00cf6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 1839afb5ce..334fb9252a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 7109a54ed1..5df6b208a3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index 165f9b4668..80e30184ff 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index df3acc3df1..7c51b0ad38 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index bab0af38a8..1c31ff4a11 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index cfb6455ad0..31d29ef3dd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index f467c9e4c3..e25524223a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index a397ed5ef8..99e497af54 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -52,8 +52,8 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index dc02d363c8..ea86074f0e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 543774b24c..e1c584d405 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 8e4db9d92c..a7e3f28ed6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 0d59d2ff65..e8d7efa6b0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 85dbfd4647..ed78abf81d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 7642b46cbf..a99d5fcb63 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 6cc03e2c2b..48cdb8e80b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 9e824ae2f0..8ee8e52cca 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 21dcd2d13d..9565b3e5ca 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 6b1a6a94e8..1b20e2e248 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 29f7828f27..a9fd8d923a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 12bc7c708d..79e1193ac0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index ce98ab493d..d0add3fa49 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 595da81538..ab9f0c33f7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 945ff531e4..b9c3900403 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 1ee323a63c..7da966ce9f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 989d2e582f..2c715b4efb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d7fcffbdb5..4468b67642 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index ce66388a02..ecb0ab9738 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index fb025563e6..d7d4d2b449 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 60cfa6b927..6d1eea218a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 61920f471b..f89be1cfcb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index ff361e97a4..1840fcded7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 17fa6aeaf2..f02aaa9ace 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 3ec19e6e89..1e392c2ff7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 81e3a8f4c9..7e89bd6ed3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index e7a8e8baf6..7fbd7ebecb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 56cf3b84cc..b9a7aadbf7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 59c63fceca..acee799091 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index a4f0ecaefb..d5690408da 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51cd76618e..af8b12547e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 38bda2e6fb..e9cd6a88b8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 3ec3d494e8..db168592f1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 93588924fe..077f33cb49 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 07725028a6..76375a86f7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c9e5eabc7..ef1d37297e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index e4fb9e4160..b65005003d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 51abfa9d3e..f49138fafe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 4bd0a38bda..7e0614b359 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 6d0df16c27..0e6e64c7b2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 61a01d067c..658087380a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 84bc5a6eba..3800940bac 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index b79342c0a8..3a780986a0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index bd768c74e2..c4598a72e6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index a5616075a6..e1da19cc8f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ced39204d3..fbb5c84dfe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4068629bde..d05590cbde 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index d8f88333df..df50db952f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 0dc656cef6..2d352ea5cd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c742d534c4..c59568bf1d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index a22b36335e..35ca986d35 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 271ec4401b..37150ec357 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 6b8cd1358f..c32d4f7c04 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java index 3c87faec44..f61481565a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.vip; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/DocumentBase.java index 65e18e4a0e..bcbe96ad19 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -134,9 +137,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/SiegeGuards.java index 8ac4fe72af..c9ca7df743 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index fa45b28c67..42d382f269 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index dd4215411e..a8e6c06eed 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 418ed93b2a..4081019df2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 5b1db54836..e7113941ec 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index f73f3c2e73..5d3caadfd5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 6a67c2d642..2e5b2846bf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index dd5c2f593d..2ea2bf9f11 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 4e5a8d7aaf..1950403a0d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d5d2ad10cf..8f4db5d580 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 24d5d75b7a..704f15e5ba 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 19226dce0f..6cd820aedf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2b6db19588..607dc3b8f5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 437b502a95..b8985f0fef 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 277a03c294..c98e55ac10 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index 1866a34d94..b7c74b3b74 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 7f55fdc9ed..7e0edf65b8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 28b0f453fc..5c2f25e7f2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 2ed9c1c346..7f5e0e87a1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index ebbd33bda0..f952b58fa2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 189a2f7e73..714a195ccb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index abb1a84fd5..e25bb1c5c2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hp.java index fbcd2b94a4..d3f80b04fe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 7d2f4894c6..770b66ee92 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 02468039cf..742f98e38b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 742ca00283..3d97c9ac22 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 3eb4d77710..8b4d315b50 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index a88c6c50c5..0aa5cb3e1f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index aaa9641567..721bf8ce08 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6f313482ab..54230f39a1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b4ea6e761f..bfc5324c4d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 410e71cff8..01714d7f5a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VipUp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VipUp.java index 9cf1267bbb..f716953da2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VipUp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VipUp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java index ad487044b9..db8516fac9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ElementalSpirit; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index ecb73b365e..30e5fd51af 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 80351144d6..44599b2555 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 2472a2d955..85d614b478 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index d1d5c8c332..c2610ec4e3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index abf3b47d43..d0c1cf040c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 3ae04b22f4..c32e1327ea 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index a02dc34079..8167aa1eef 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 02629d5d34..e17c4d3c90 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27f0904f0f..a61cc1bd71 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 255f805e72..12f575b243 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index 3988e77104..587f809dc9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 77b9a03185..c0d47bc8de 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java index 4e5984b292..efde71ba49 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java index e70725593d..954c6b4142 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java index a3a6734f90..13e468df91 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.QuestSoundHtmlHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java index d29aaf54b5..7773083c9a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java index cb732dea8c..bd13a4bbe9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java index 00920614ce..0d21264633 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java index bb78cafa1c..670e0a7192 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/ItemTable.java index 9182d52fcc..94b4547625 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index 313709ab07..4b2cf3b555 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 0f8815bcc4..475f0085d8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index d134fe859e..c57e62c683 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index e131a0f0e5..3359c09da3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 07af46b4a4..339a7e047c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index 1b5d73308d..4ed0600683 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 0f7be781b2..7bc7be8487 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index ba3ab89b07..20d23bc7fc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 03cb8145be..5cba56b98c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -35,9 +35,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 3d21c7ddf0..5f3eb28e8a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ArmorSet.java index 2a57f20a10..6b504526ef 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CombatFlag.java index e726f912f1..e0487f9079 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 142e7874c0..31885961ce 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java index ec67ca4a4a..5244307c22 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java @@ -45,8 +45,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ShortCuts.java index a9796fbbb7..36f3461010 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TradeList.java index bbafcb1416..bea714862c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java index b3e2469c24..1c5b3588c3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -66,8 +66,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8d7813d677..93970f20a1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -116,12 +116,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java index fa66dfe236..1b015f1bff 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -75,8 +75,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java index a91d00df76..51485dc402 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -231,22 +231,22 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Summon.java index d6d2c3d555..9658fe75ff 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 2dd9a62da6..ed26029abd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index 6d0c4d66fa..2ad4775ebe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b621ac99a1..b2b77ee360 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index 99060558ba..4552b070ca 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index b1b98408e0..55d2f3556b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 29208b2b65..8e5328b099 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index da5ff96580..87cb594bc9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -40,8 +40,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.vip.VipManager; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9f908898ea..ebdbe02899 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index d60e1343b9..1f55ed1bae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 2e75866e00..0b472089a8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index fcd8e14da5..2613a1847b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index bab8b12ab1..9f4fdbdfc9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index a5fea7c6f6..347f281026 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index dc2add2a3a..8c8b2b019d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -130,15 +130,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index 92bce4268b..14cccac24d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 79c69f739d..41f554b9e0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index b86121305d..b18ff0fce9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Armor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Armor.java new file mode 100644 index 0000000000..c2d573ea62 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -0,0 +1,92 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.ArmorType; + +/** + * This class is dedicated to the management of armors. + */ +public class Armor extends ItemTemplate +{ + private ArmorType _type; + + /** + * Constructor for Armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. + */ + public Armor(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); + + final long bodyPart = getBodyPart(); + if (bodyPart == ItemTemplate.SLOT_ARTIFACT) + { + _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; + _type2 = ItemTemplate.TYPE2_ACCESSORY; + } + else if ((bodyPart == ItemTemplate.SLOT_NECK) || ((bodyPart & ItemTemplate.SLOT_L_EAR) != 0) || ((bodyPart & ItemTemplate.SLOT_L_FINGER) != 0) || ((bodyPart & ItemTemplate.SLOT_R_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_L_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_ARTIFACT_BOOK) != 0)) + { + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_ACCESSORY; + } + else + { + if ((_type == ArmorType.NONE) && (getBodyPart() == ItemTemplate.SLOT_L_HAND)) + { + _type = ArmorType.SHIELD; + } + _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; + _type2 = ItemTemplate.TYPE2_SHIELD_ARMOR; + } + } + + /** + * @return the type of the armor. + */ + @Override + public ArmorType getItemType() + { + return _type; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise + */ + @Override + public boolean isArmor() + { + return true; + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Henna.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Henna.java new file mode 100644 index 0000000000..d029309b0f --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -0,0 +1,171 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; + +/** + * Class for the Henna object. + * @author Zoey76 + */ +public class Henna +{ + private final int _dyeId; + private final int _dyeItemId; + private final Map _baseStats = new HashMap<>(); + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final int _duration; + private final List _skills; + private final List _wearClass; + + public Henna(StatSet set) + { + _dyeId = set.getInt("dyeId"); + _dyeItemId = set.getInt("dyeItemId"); + _baseStats.put(BaseStat.STR, set.getInt("str", 0)); + _baseStats.put(BaseStat.CON, set.getInt("con", 0)); + _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); + _baseStats.put(BaseStat.INT, set.getInt("int", 0)); + _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); + _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _duration = set.getInt("duration", -1); + _skills = new ArrayList<>(); + _wearClass = new ArrayList<>(); + } + + /** + * @return the dye Id. + */ + public int getDyeId() + { + return _dyeId; + } + + /** + * @return the item Id, required for this dye. + */ + public int getDyeItemId() + { + return _dyeItemId; + } + + public int getBaseStats(BaseStat stat) + { + return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); + } + + public Map getBaseStats() + { + return _baseStats; + } + + /** + * @return the wear fee, cost for adding this dye to the player. + */ + public int getWearFee() + { + return _wearFee; + } + + /** + * @return the wear count, the required count to add this dye to the player. + */ + public int getWearCount() + { + return _wearCount; + } + + /** + * @return the cancel fee, cost for removing this dye from the player. + */ + public int getCancelFee() + { + return _cancelFee; + } + + /** + * @return the cancel count, the retrieved amount of dye items after removing the dye. + */ + public int getCancelCount() + { + return _cancelCount; + } + + /** + * @return the duration of this dye. + */ + public int getDuration() + { + return _duration; + } + + /** + * @param skillList the list of skills related to this dye. + */ + public void setSkills(List skillList) + { + _skills.addAll(skillList); + } + + /** + * @return the skills related to this dye. + */ + public List getSkills() + { + return _skills; + } + + /** + * @return the list with the allowed classes to wear this dye. + */ + public List getAllowedWearClass() + { + return _wearClass; + } + + /** + * @param classId the class trying to wear this dye. + * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. + */ + public boolean isAllowedClass(ClassId classId) + { + return _wearClass.contains(classId); + } + + /** + * @param wearClassIds the list of classes that can wear this dye. + */ + public void setWearClassIds(List wearClassIds) + { + _wearClass.addAll(wearClassIds); + } +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index 499de2a7d7..28646ed3de 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java new file mode 100644 index 0000000000..b289fa70ae --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -0,0 +1,300 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.Collection; +import java.util.Objects; + +import org.l2jmobius.gameserver.enums.AttributeType; +import org.l2jmobius.gameserver.model.VariationInstance; +import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * This class contains Item
+ * Use to sort Item of : + *
    + *
  • Armor
    • + *
  • EtcItem
    • + *
  • Weapon
    • + *
+ * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ + */ +public class WarehouseItem +{ + private final ItemTemplate _item; + private final int _object; + private final long _count; + private final int _owner; + private final int _locationSlot; + private final int _enchant; + private final CrystalType _grade; + private final VariationInstance _augmentation; + private final int _customType1; + private final int _customType2; + private final int _mana; + + private byte _elemAtkType = -2; + private int _elemAtkPower = 0; + + private final int[] _elemDefAttr = + { + 0, + 0, + 0, + 0, + 0, + 0 + }; + + private final int[] _enchantOptions; + private final Collection _soulCrystalOptions; + private final Collection _soulCrystalSpecialOptions; + + private final int _time; + + public WarehouseItem(Item item) + { + Objects.requireNonNull(item); + _item = item.getItem(); + _object = item.getObjectId(); + _count = item.getCount(); + _owner = item.getOwnerId(); + _locationSlot = item.getLocationSlot(); + _enchant = item.getEnchantLevel(); + _customType1 = item.getCustomType1(); + _customType2 = item.getCustomType2(); + _grade = item.getItem().getCrystalType(); + _augmentation = item.getAugmentation(); + _mana = item.getMana(); + _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; + _elemAtkType = item.getAttackAttributeType().getClientId(); + _elemAtkPower = item.getAttackAttributePower(); + for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) + { + _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); + } + _enchantOptions = item.getEnchantOptions(); + _soulCrystalOptions = item.getSpecialAbilities(); + _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); + } + + /** + * @return the item. + */ + public ItemTemplate getItem() + { + return _item; + } + + /** + * @return the unique objectId. + */ + public int getObjectId() + { + return _object; + } + + /** + * @return the owner. + */ + public int getOwnerId() + { + return _owner; + } + + /** + * @return the location slot. + */ + public int getLocationSlot() + { + return _locationSlot; + } + + /** + * @return the count. + */ + public long getCount() + { + return _count; + } + + /** + * @return the first type. + */ + public int getType1() + { + return _item.getType1(); + } + + /** + * @return the second type. + */ + public int getType2() + { + return _item.getType2(); + } + + /** + * @return the second type. + */ + public ItemType getItemType() + { + return _item.getItemType(); + } + + /** + * @return the ItemId. + */ + public int getItemId() + { + return _item.getId(); + } + + /** + * @return the part of body used with this item. + */ + public long getBodyPart() + { + return _item.getBodyPart(); + } + + /** + * @return the enchant level. + */ + public int getEnchantLevel() + { + return _enchant; + } + + /** + * @return the item grade + */ + public CrystalType getItemGrade() + { + return _grade; + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + public boolean isWeapon() + { + return (_item instanceof Weapon); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise. + */ + public boolean isArmor() + { + return (_item instanceof Armor); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + public boolean isEtcItem() + { + return (_item instanceof EtcItem); + } + + /** + * @return the name of the item + */ + public String getItemName() + { + return _item.getName(); + } + + /** + * @return the augmentation If. + */ + public VariationInstance getAugmentation() + { + return _augmentation; + } + + /** + * @return the name of the item + */ + public String getName() + { + return _item.getName(); + } + + public int getCustomType1() + { + return _customType1; + } + + public int getCustomType2() + { + return _customType2; + } + + public int getMana() + { + return _mana; + } + + public byte getAttackElementType() + { + return _elemAtkType; + } + + public int getAttackElementPower() + { + return _elemAtkPower; + } + + public int getElementDefAttr(byte i) + { + return _elemDefAttr[i]; + } + + public int[] getEnchantOptions() + { + return _enchantOptions; + } + + public Collection getSoulCrystalOptions() + { + return _soulCrystalOptions; + } + + public Collection getSoulCrystalSpecialOptions() + { + return _soulCrystalSpecialOptions; + } + + public int getTime() + { + return _time; + } + + /** + * @return the name of the item + */ + @Override + public String toString() + { + return _item.toString(); + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Weapon.java new file mode 100644 index 0000000000..3ae599da0d --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -0,0 +1,311 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.enums.ItemSkillType; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is dedicated to the management of weapons. + */ +public class Weapon extends ItemTemplate +{ + private WeaponType _type; + private boolean _isMagicWeapon; + private int _soulShotCount; + private int _spiritShotCount; + private int _mpConsume; + private int _baseAttackRange; + private int _baseAttackRadius; + private int _baseAttackAngle; + private int _changeWeaponId; + + private int _reducedSoulshot; + private int _reducedSoulshotChance; + + private int _reducedMpConsume; + private int _reducedMpConsumeChance; + + private boolean _isForceEquip; + private boolean _isAttackWeapon; + private boolean _useWeaponSkillsOnly; + + /** + * Constructor for Weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. + */ + public Weapon(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_WEAPON; + _isMagicWeapon = set.getBoolean("is_magic_weapon", false); + _soulShotCount = set.getInt("soulshots", 0); + _spiritShotCount = set.getInt("spiritshots", 0); + _mpConsume = set.getInt("mp_consume", 0); + _baseAttackRange = set.getInt("attack_range", 40); + final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) + { + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + } + else + { + _baseAttackRadius = 40; + _baseAttackAngle = 240; // 360 - 120 + } + + final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); + _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; + _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; + + final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); + _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; + _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; + _changeWeaponId = set.getInt("change_weaponId", 0); + _isForceEquip = set.getBoolean("isForceEquip", false); + _isAttackWeapon = set.getBoolean("isAttackWeapon", true); + _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); + } + + /** + * @return the type of Weapon + */ + @Override + public WeaponType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + @Override + public boolean isWeapon() + { + return true; + } + + /** + * @return {@code true} if the weapon is magic, {@code false} otherwise. + */ + @Override + public boolean isMagicWeapon() + { + return _isMagicWeapon; + } + + /** + * @return the quantity of SoulShot used. + */ + public int getSoulShotCount() + { + return _soulShotCount; + } + + /** + * @return the quantity of SpiritShot used. + */ + public int getSpiritShotCount() + { + return _spiritShotCount; + } + + /** + * @return the reduced quantity of SoultShot used. + */ + public int getReducedSoulShot() + { + return _reducedSoulshot; + } + + /** + * @return the chance to use Reduced SoultShot. + */ + public int getReducedSoulShotChance() + { + return _reducedSoulshotChance; + } + + /** + * @return the MP consumption with the weapon. + */ + public int getMpConsume() + { + return _mpConsume; + } + + public int getBaseAttackRange() + { + return _baseAttackRange; + } + + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + + /** + * @return the reduced MP consumption with the weapon. + */ + public int getReducedMpConsume() + { + return _reducedMpConsume; + } + + /** + * @return the chance to use getReducedMpConsume() + */ + public int getReducedMpConsumeChance() + { + return _reducedMpConsumeChance; + } + + /** + * @return the Id in which weapon this weapon can be changed. + */ + public int getChangeWeaponId() + { + return _changeWeaponId; + } + + /** + * @return {@code true} if the weapon is force equip, {@code false} otherwise. + */ + public boolean isForceEquip() + { + return _isForceEquip; + } + + /** + * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. + */ + public boolean isAttackWeapon() + { + return _isAttackWeapon; + } + + /** + * @return {@code true} if the weapon is skills only, {@code false} otherwise. + */ + public boolean useWeaponSkillsOnly() + { + return _useWeaponSkillsOnly; + } + + /** + * @param caster the Creature pointing out the caster + * @param target the Creature pointing out the target + * @param trigger + * @param type + */ + public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) + { + forEachSkill(type, holder -> + { + final Skill skill = holder.getSkill(); + if (Rnd.get(100) >= holder.getChance()) + { + return; + } + + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // Trigger only if both are good or bad magic. + if (trigger.isBad() != skill.isBad()) + { + return; + } + + // No Trigger if not Magic Skill or is toggle + if (trigger.isMagic() != skill.isMagic()) + { + return; + } + + // No Trigger if skill is toggle + if (trigger.isToggle()) + { + return; + } + + if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) + { + return; + } + } + + // Skill condition not met + if (!skill.checkCondition(caster, target)) + { + return; + } + + skill.activateSkill(caster, target); + + // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // notify quests of a skill use + if (caster.isPlayer()) + { + World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); + } + if (caster.isPlayer()) + { + final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); + sm.addSkillName(skill); + caster.sendPacket(sm); + } + } + }); + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java new file mode 100644 index 0000000000..610e720125 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -0,0 +1,558 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.network.SystemMessageId; + +/** + * @author UnAfraid + */ +public class AppearanceStone +{ + private final int _id; + private final int _cost; + private final int _visualId; + private final long _lifeTime; + private final AppearanceType _type; + private final WeaponType _weaponType; + private final ArmorType _armorType; + private final AppearanceHandType _handType; + private final AppearanceMagicType _magicType; + private List _crystalTypes; + private List _targetTypes; + private List _bodyParts; + private List _races; + private List _racesNot; + private List _allVisualIds; + + public AppearanceStone(StatSet set) + { + _id = set.getInt("id"); + _visualId = set.getInt("visualId", 0); + _cost = set.getInt("cost", 0); + _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); + _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); + _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); + _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); + _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); + _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); + + final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); + if (targetType != AppearanceTargetType.NONE) + { + addTargetType(targetType); + } + + // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. + final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); + + // If no crystal type is defined, we must add all defaults. + if (crystalType == null) + { + switch (targetType) + { + case ACCESSORY: + case ALL: + { + addCrystalType(CrystalType.NONE); + // fallthrough + } + case WEAPON: + case ARMOR: + { + for (CrystalType cryType : CrystalType.values()) + { + if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) + { + addCrystalType(cryType); + } + } + } + } + } + else + { + addCrystalType(crystalType); + } + + final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); + if (bodyPart != ItemTemplate.SLOT_NONE) + { + addBodyPart(bodyPart); + } + + final Race race = set.getEnum("race", Race.class, Race.NONE); + if (race != Race.NONE) + { + addRace(race); + } + + final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); + if (raceNot != Race.NONE) + { + addRaceNot(raceNot); + } + } + + public int getId() + { + return _id; + } + + public int getVisualId() + { + return _visualId; + } + + public int getCost() + { + return _cost; + } + + public long getLifeTime() + { + return _lifeTime; + } + + public AppearanceType getType() + { + return _type; + } + + public WeaponType getWeaponType() + { + return _weaponType; + } + + public ArmorType getArmorType() + { + return _armorType; + } + + public AppearanceHandType getHandType() + { + return _handType; + } + + public AppearanceMagicType getMagicType() + { + return _magicType; + } + + public void addCrystalType(CrystalType type) + { + if (_crystalTypes == null) + { + _crystalTypes = new ArrayList<>(); + } + _crystalTypes.add(type); + } + + public List getCrystalTypes() + { + return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); + } + + public void addTargetType(AppearanceTargetType type) + { + if (_targetTypes == null) + { + _targetTypes = new ArrayList<>(); + } + _targetTypes.add(type); + } + + public List getTargetTypes() + { + return _targetTypes != null ? _targetTypes : Collections.emptyList(); + } + + public void addBodyPart(long part) + { + if (_bodyParts == null) + { + _bodyParts = new ArrayList<>(); + } + _bodyParts.add(part); + } + + public void addVisualId(AppearanceHolder appearanceHolder) + { + if (_allVisualIds == null) + { + _allVisualIds = new ArrayList<>(); + } + _allVisualIds.add(appearanceHolder); + } + + public List getVisualIds() + { + return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); + } + + public List getBodyParts() + { + return _bodyParts != null ? _bodyParts : Collections.emptyList(); + } + + public void addRace(Race race) + { + if (_races == null) + { + _races = new ArrayList<>(); + } + _races.add(race); + } + + public List getRaces() + { + return _races != null ? _races : Collections.emptyList(); + } + + public void addRaceNot(Race race) + { + if (_racesNot == null) + { + _racesNot = new ArrayList<>(); + } + _racesNot.add(race); + } + + public List getRacesNot() + { + return _racesNot != null ? _racesNot : Collections.emptyList(); + } + + /** + * @param player the actor requesting to use this appearance. + * @param targetItem the item to be modified with this appearance. + * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. + */ + public boolean checkConditions(Player player, Item targetItem) + { + if (targetItem == null) + { + return false; + } + + if (getTargetTypes().isEmpty()) + { + return false; + } + + if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); + return false; + } + + switch (_type) + { + case RESTORE: + { + if (targetItem.getVisualId() == 0) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); + return false; + } + + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + default: + { + // Seems like in retail item with already changed appearance, can be changed again without being restored. + + final AppearanceTargetType targetType = getTargetTypes().get(0); + switch (targetType) + { + case NONE: + { + return false; + } + case WEAPON: + { + if (!targetItem.isWeapon()) + { + player.sendPacket(SystemMessageId.WEAPONS_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ARMOR: + { + if (!targetItem.isArmor()) + { + player.sendPacket(SystemMessageId.ARMOR_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ACCESSORY: + { + if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + { + player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); + return false; + } + break; + } + case ALL: + { + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (findVisualChange(targetItem) == null) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + return true; + } + } + break; + } + } + + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (_weaponType != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) + { + if (_weaponType != WeaponType.CROSSBOW) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + } + + switch (_handType) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + } + + switch (_magicType) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + if (_armorType != ArmorType.NONE) + { + switch (_armorType) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + return true; + } + + public AppearanceHolder findVisualChange(Item targetItem) + { + for (AppearanceHolder holder : _allVisualIds) + { + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + { + continue; + } + + if (holder.getWeaponType() != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) + { + if (holder.getWeaponType() != WeaponType.CROSSBOW) + { + continue; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + continue; + } + } + + switch (holder.getHandType()) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + continue; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + continue; + } + break; + } + } + + switch (holder.getMagicType()) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + continue; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + continue; + } + } + } + } + + if (holder.getArmorType() != ArmorType.NONE) + { + switch (holder.getArmorType()) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + continue; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + continue; + } + } + } + } + return holder; + } + return null; + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java new file mode 100644 index 0000000000..6f73983c0e --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -0,0 +1,65 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import java.util.EnumMap; +import java.util.Map; + +import org.l2jmobius.gameserver.model.StatSet; + +/** + * @author UnAfraid + */ +public class CombinationItem +{ + private final int _itemOne; + private final int _itemTwo; + private final int _chance; + private final Map _rewards = new EnumMap<>(CombinationItemType.class); + + public CombinationItem(StatSet set) + { + _itemOne = set.getInt("one"); + _itemTwo = set.getInt("two"); + _chance = set.getInt("chance"); + } + + public int getItemOne() + { + return _itemOne; + } + + public int getItemTwo() + { + return _itemTwo; + } + + public int getChance() + { + return _chance; + } + + public void addReward(CombinationItemReward item) + { + _rewards.put(item.getType(), item); + } + + public CombinationItemReward getReward(CombinationItemType type) + { + return _rewards.get(type); + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java new file mode 100644 index 0000000000..8890655085 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -0,0 +1,210 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.logging.Logger; + +import org.l2jmobius.commons.util.CommonUtil; +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public abstract class AbstractEnchantItem +{ + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); + + private static final ItemType[] ENCHANT_TYPES = new ItemType[] + { + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + EtcItemType.BLESS_ENCHT_AM, + EtcItemType.BLESS_ENCHT_AM_DOWN, + EtcItemType.BLESS_ENCHT_WP, + EtcItemType.ENCHT_AM, + EtcItemType.ENCHT_WP, + EtcItemType.GIANT_ENCHT_AM, + EtcItemType.GIANT_ENCHT_WP, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + }; + + private final int _id; + private final CrystalType _grade; + private final int _minEnchantLevel; + private final int _maxEnchantLevel; + private final int _safeEnchantLevel; + private final int _randomEnchantMin; + private final int _randomEnchantMax; + private final double _bonusRate; + + public AbstractEnchantItem(StatSet set) + { + _id = set.getInt("id"); + if (getItem() == null) + { + throw new NullPointerException(); + } + else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) + { + throw new IllegalAccessError(); + } + _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); + _minEnchantLevel = set.getInt("minEnchant", 0); + _maxEnchantLevel = set.getInt("maxEnchant", 127); + _safeEnchantLevel = set.getInt("safeEnchant", 0); + _randomEnchantMin = set.getInt("randomEnchantMin", 1); + _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); + _bonusRate = set.getDouble("bonusRate", 0); + } + + /** + * @return id of current item + */ + public int getId() + { + return _id; + } + + /** + * @return bonus chance that would be added + */ + public double getBonusRate() + { + return _bonusRate; + } + + /** + * @return {@link ItemTemplate} current item/scroll + */ + public ItemTemplate getItem() + { + return ItemTable.getInstance().getTemplate(_id); + } + + /** + * @return grade of the item/scroll. + */ + public CrystalType getGrade() + { + return _grade; + } + + /** + * @return {@code true} if scroll is for weapon, {@code false} for armor + */ + public abstract boolean isWeapon(); + + /** + * @return the minimum enchant level that this scroll/item can be used with + */ + public int getMinEnchantLevel() + { + return _minEnchantLevel; + } + + /** + * @return the maximum enchant level that this scroll/item can be used with + */ + public int getMaxEnchantLevel() + { + return _maxEnchantLevel; + } + + /** + * @return the safe enchant level of this scroll/item + */ + public int getSafeEnchant() + { + return _safeEnchantLevel; + } + + /** + * @return the minimum random enchant level of this scroll/item + */ + public int getRandomEnchantMin() + { + return _randomEnchantMin; + } + + /** + * @return the maximum random enchant level of this scroll/item + */ + public int getRandomEnchantMax() + { + return _randomEnchantMax; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem + * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise + */ + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if (itemToEnchant == null) + { + return false; + } + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + { + return false; + } + else if (!isValidItemType(itemToEnchant.getItem().getType2())) + { + return false; + } + else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) + { + return false; + } + else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + { + return false; + } + return true; + } + + /** + * @param type2 + * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise + */ + private boolean isValidItemType(int type2) + { + if (type2 == ItemTemplate.TYPE2_WEAPON) + { + return isWeapon(); + } + else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) + { + return !isWeapon(); + } + return false; + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..1099b77054 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private long _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(long slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java new file mode 100644 index 0000000000..9a80e104b0 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -0,0 +1,229 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.HashSet; +import java.util.Set; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.data.xml.EnchantItemData; +import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author UnAfraid + */ +public class EnchantScroll extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isBlessedDown; + private final boolean _isSafe; + private final boolean _isGiant; + private final int _scrollGroupId; + private Set _items; + + public EnchantScroll(StatSet set) + { + super(set); + _scrollGroupId = set.getInt("scrollGroupId", 0); + + final ItemType type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN); + _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + /** + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will reset to 0), {@code false} otherwise + */ + public boolean isBlessed() + { + return _isBlessed; + } + + /** + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise + */ + public boolean isBlessedDown() + { + return _isBlessedDown; + } + + /** + * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise + */ + public boolean isSafe() + { + return _isSafe; + } + + public boolean isGiant() + { + return _isGiant; + } + + /** + * @return id of scroll group that should be used + */ + public int getScrollGroupId() + { + return _scrollGroupId; + } + + /** + * Enforces current scroll to use only those items as possible items to enchant + * @param itemId + */ + public void addItem(int itemId) + { + if (_items == null) + { + _items = new HashSet<>(); + } + _items.add(itemId); + } + + public Set getItems() + { + return _items; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem the support item used when enchanting (can be null) + * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise + */ + @Override + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if ((_items != null) && !_items.contains(itemToEnchant.getId())) + { + return false; + } + else if ((supportItem != null)) + { + if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed())) + { + return false; + } + else if ((isBlessedDown() && !supportItem.isBlessed()) || (!isBlessedDown() && supportItem.isBlessed())) + { + return false; + } + else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant())) + { + return false; + } + else if (!supportItem.isValid(itemToEnchant, supportItem)) + { + return false; + } + else if (supportItem.isWeapon() != isWeapon()) + { + return false; + } + } + if (_items == null) + { + for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls()) + { + if (scroll.getId() == getId()) + { + continue; + } + final Set scrollItems = scroll.getItems(); + if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId())) + { + return false; + } + } + } + return super.isValid(itemToEnchant, supportItem); + } + + /** + * @param player + * @param enchantItem + * @return the chance of current scroll's group. + */ + public double getChance(Player player, Item enchantItem) + { + if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) + { + LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); + return -1; + } + + final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); + if (group == null) + { + LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); + return -1; + } + + if ((getSafeEnchant() > 0) && (enchantItem.getEnchantLevel() < getSafeEnchant())) + { + return 100; + } + + return group.getChance(enchantItem.getEnchantLevel()); + } + + /** + * @param player + * @param enchantItem + * @param supportItem + * @return the total chance for success rate of this scroll + */ + public EnchantResultType calculateSuccess(Player player, Item enchantItem, EnchantSupportItem supportItem) + { + if (!isValid(enchantItem, supportItem)) + { + return EnchantResultType.ERROR; + } + + final double chance = getChance(player, enchantItem); + if (chance == -1) + { + return EnchantResultType.ERROR; + } + + final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; + final double bonusRate = getBonusRate(); + final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; + final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100); + final double random = 100 * Rnd.nextDouble(); + final boolean success = (random < finalChance); + return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE; + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java new file mode 100644 index 0000000000..bfe1c295da --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -0,0 +1,57 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public class EnchantSupportItem extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isGiant; + private final ItemType type; + + public EnchantSupportItem(StatSet set) + { + super(set); + type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + public boolean isBlessed() + { + return _isBlessed; + } + + public boolean isGiant() + { + return _isGiant; + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java index b196da7407..659d9f04bf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -72,15 +72,15 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java new file mode 100644 index 0000000000..c8a309674f --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -0,0 +1,88 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Crystal Type enumerated. + * @author Adry_85 + */ +public enum CrystalType +{ + NONE(0, 0, 0, 0), + D(1, 1458, 11, 90), + C(2, 1459, 6, 45), + B(3, 1460, 11, 67), + A(4, 1461, 20, 145), + S(5, 1462, 25, 250), + S80(6, 1462, 25, 250), + S84(7, 1462, 25, 250), + R(8, 17371, 30, 500), + R95(9, 17371, 30, 500), + R99(10, 17371, 30, 500), + EVENT(11, 0, 0, 0); + + private final int _level; + private final int _crystalId; + private final int _crystalEnchantBonusArmor; + private final int _crystalEnchantBonusWeapon; + + CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) + { + _level = level; + _crystalId = crystalId; + _crystalEnchantBonusArmor = crystalEnchantBonusArmor; + _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; + } + + /** + * Gets the crystal type ID. + * @return the crystal type ID + */ + public int getLevel() + { + return _level; + } + + /** + * Gets the item ID of the crystal. + * @return the item ID of the crystal + */ + public int getCrystalId() + { + return _crystalId; + } + + public int getCrystalEnchantBonusArmor() + { + return _crystalEnchantBonusArmor; + } + + public int getCrystalEnchantBonusWeapon() + { + return _crystalEnchantBonusWeapon; + } + + public boolean isGreater(CrystalType crystalType) + { + return getLevel() > crystalType.getLevel(); + } + + public boolean isLesser(CrystalType crystalType) + { + return getLevel() < crystalType.getLevel(); + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java new file mode 100644 index 0000000000..834b0c3996 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -0,0 +1,105 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * EtcItem Type enumerated. + */ +public enum EtcItemType implements ItemType +{ + NONE, + SCROLL, + ARROW, + POTION, + SPELLBOOK, + RECIPE, + MATERIAL, + PET_COLLAR, + CASTLE_GUARD, + DYE, + SEED, + SEED2, + HARVEST, + LOTTO, + RACE_TICKET, + TICKET_OF_LORD, + LURE, + CROP, + MATURECROP, + ENCHT_WP, + ENCHT_AM, + GIANT_ENCHT_WP, + GIANT_ENCHT_AM, + BLESS_ENCHT_WP, + BLESS_ENCHT_AM, + BLESS_ENCHT_AM_DOWN, + COUPON, + ELIXIR, + ENCHT_ATTR, + ENCHT_ATTR_CURSED, + BOLT, + ENCHT_ATTR_INC_PROP_ENCHT_WP, + ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_RUNE, + ENCHT_ATTRT_RUNE_SELECT, + TELEPORTBOOKMARK, + CHANGE_ATTR, + SOULSHOT, + SHAPE_SHIFTING_WP, + BLESS_SHAPE_SHIFTING_WP, + // EIT_RESTORE_SHAPE_SHIFTING_WP, + SHAPE_SHIFTING_WP_FIXED, + SHAPE_SHIFTING_AM, + BLESS_SHAPE_SHIFTING_AM, + SHAPE_SHIFTING_AM_FIXED, + SHAPE_SHIFTING_HAIRACC, + BLESS_SHAPE_SHIFTING_HAIRACC, + SHAPE_SHIFTING_HAIRACC_FIXED, + RESTORE_SHAPE_SHIFTING_WP, + RESTORE_SHAPE_SHIFTING_AM, + RESTORE_SHAPE_SHIFTING_HAIRACC, + RESTORE_SHAPE_SHIFTING_ALLITEM, + BLESS_INC_PROP_ENCHT_WP, + BLESS_INC_PROP_ENCHT_AM, + CARD_EVENT, + SHAPE_SHIFTING_ALLITEM_FIXED, + MULTI_ENCHT_WP, + MULTI_ENCHT_AM, + MULTI_INC_PROB_ENCHT_WP, + MULTI_INC_PROB_ENCHT_AM, + SOUL_CRYSTAL, + ENSOUL_STONE; + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return 0; + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 8323d4bdc7..06760564d7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index c0a8c1156a..68e0eb9b66 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -54,14 +54,14 @@ import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 6f6d11a97d..c8e13e1e2c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Armor.java deleted file mode 100644 index a2f1c2d3e6..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Armor.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; - -/** - * This class is dedicated to the management of armors. - */ -public class Armor extends ItemTemplate -{ - private ArmorType _type; - - /** - * Constructor for Armor. - * @param set the StatSet designating the set of couples (key,value) characterizing the armor. - */ - public Armor(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); - - final long bodyPart = getBodyPart(); - if (bodyPart == ItemTemplate.SLOT_ARTIFACT) - { - _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; - _type2 = ItemTemplate.TYPE2_ACCESSORY; - } - else if ((bodyPart == ItemTemplate.SLOT_NECK) || ((bodyPart & ItemTemplate.SLOT_L_EAR) != 0) || ((bodyPart & ItemTemplate.SLOT_L_FINGER) != 0) || ((bodyPart & ItemTemplate.SLOT_R_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_L_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_ARTIFACT_BOOK) != 0)) - { - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_ACCESSORY; - } - else - { - if ((_type == ArmorType.NONE) && (getBodyPart() == ItemTemplate.SLOT_L_HAND)) - { - _type = ArmorType.SHIELD; - } - _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; - _type2 = ItemTemplate.TYPE2_SHIELD_ARMOR; - } - } - - /** - * @return the type of the armor. - */ - @Override - public ArmorType getItemType() - { - return _type; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise - */ - @Override - public boolean isArmor() - { - return true; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Henna.java deleted file mode 100644 index 09fdb7abcb..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Henna.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.l2jmobius.gameserver.enums.ClassId; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; - -/** - * Class for the Henna object. - * @author Zoey76 - */ -public class Henna -{ - private final int _dyeId; - private final int _dyeItemId; - private final Map _baseStats = new HashMap<>(); - private final int _wearFee; - private final int _wearCount; - private final int _cancelFee; - private final int _cancelCount; - private final int _duration; - private final List _skills; - private final List _wearClass; - - public Henna(StatSet set) - { - _dyeId = set.getInt("dyeId"); - _dyeItemId = set.getInt("dyeItemId"); - _baseStats.put(BaseStat.STR, set.getInt("str", 0)); - _baseStats.put(BaseStat.CON, set.getInt("con", 0)); - _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); - _baseStats.put(BaseStat.INT, set.getInt("int", 0)); - _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); - _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _wearFee = set.getInt("wear_fee"); - _wearCount = set.getInt("wear_count"); - _cancelFee = set.getInt("cancel_fee"); - _cancelCount = set.getInt("cancel_count"); - _duration = set.getInt("duration", -1); - _skills = new ArrayList<>(); - _wearClass = new ArrayList<>(); - } - - /** - * @return the dye Id. - */ - public int getDyeId() - { - return _dyeId; - } - - /** - * @return the item Id, required for this dye. - */ - public int getDyeItemId() - { - return _dyeItemId; - } - - public int getBaseStats(BaseStat stat) - { - return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); - } - - public Map getBaseStats() - { - return _baseStats; - } - - /** - * @return the wear fee, cost for adding this dye to the player. - */ - public int getWearFee() - { - return _wearFee; - } - - /** - * @return the wear count, the required count to add this dye to the player. - */ - public int getWearCount() - { - return _wearCount; - } - - /** - * @return the cancel fee, cost for removing this dye from the player. - */ - public int getCancelFee() - { - return _cancelFee; - } - - /** - * @return the cancel count, the retrieved amount of dye items after removing the dye. - */ - public int getCancelCount() - { - return _cancelCount; - } - - /** - * @return the duration of this dye. - */ - public int getDuration() - { - return _duration; - } - - /** - * @param skillList the list of skills related to this dye. - */ - public void setSkills(List skillList) - { - _skills.addAll(skillList); - } - - /** - * @return the skills related to this dye. - */ - public List getSkills() - { - return _skills; - } - - /** - * @return the list with the allowed classes to wear this dye. - */ - public List getAllowedWearClass() - { - return _wearClass; - } - - /** - * @param classId the class trying to wear this dye. - * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. - */ - public boolean isAllowedClass(ClassId classId) - { - return _wearClass.contains(classId); - } - - /** - * @param wearClassIds the list of classes that can wear this dye. - */ - public void setWearClassIds(List wearClassIds) - { - _wearClass.addAll(wearClassIds); - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java deleted file mode 100644 index 5618132356..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ /dev/null @@ -1,300 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.Collection; -import java.util.Objects; - -import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * This class contains Item
- * Use to sort Item of : - *
    - *
  • Armor
    • - *
  • EtcItem
    • - *
  • Weapon
    • - *
- * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ - */ -public class WarehouseItem -{ - private final ItemTemplate _item; - private final int _object; - private final long _count; - private final int _owner; - private final int _locationSlot; - private final int _enchant; - private final CrystalType _grade; - private final VariationInstance _augmentation; - private final int _customType1; - private final int _customType2; - private final int _mana; - - private byte _elemAtkType = -2; - private int _elemAtkPower = 0; - - private final int[] _elemDefAttr = - { - 0, - 0, - 0, - 0, - 0, - 0 - }; - - private final int[] _enchantOptions; - private final Collection _soulCrystalOptions; - private final Collection _soulCrystalSpecialOptions; - - private final int _time; - - public WarehouseItem(Item item) - { - Objects.requireNonNull(item); - _item = item.getItem(); - _object = item.getObjectId(); - _count = item.getCount(); - _owner = item.getOwnerId(); - _locationSlot = item.getLocationSlot(); - _enchant = item.getEnchantLevel(); - _customType1 = item.getCustomType1(); - _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); - _augmentation = item.getAugmentation(); - _mana = item.getMana(); - _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; - _elemAtkType = item.getAttackAttributeType().getClientId(); - _elemAtkPower = item.getAttackAttributePower(); - for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) - { - _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); - } - _enchantOptions = item.getEnchantOptions(); - _soulCrystalOptions = item.getSpecialAbilities(); - _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); - } - - /** - * @return the item. - */ - public ItemTemplate getItem() - { - return _item; - } - - /** - * @return the unique objectId. - */ - public int getObjectId() - { - return _object; - } - - /** - * @return the owner. - */ - public int getOwnerId() - { - return _owner; - } - - /** - * @return the location slot. - */ - public int getLocationSlot() - { - return _locationSlot; - } - - /** - * @return the count. - */ - public long getCount() - { - return _count; - } - - /** - * @return the first type. - */ - public int getType1() - { - return _item.getType1(); - } - - /** - * @return the second type. - */ - public int getType2() - { - return _item.getType2(); - } - - /** - * @return the second type. - */ - public ItemType getItemType() - { - return _item.getItemType(); - } - - /** - * @return the ItemId. - */ - public int getItemId() - { - return _item.getId(); - } - - /** - * @return the part of body used with this item. - */ - public long getBodyPart() - { - return _item.getBodyPart(); - } - - /** - * @return the enchant level. - */ - public int getEnchantLevel() - { - return _enchant; - } - - /** - * @return the item grade - */ - public CrystalType getItemGrade() - { - return _grade; - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - public boolean isWeapon() - { - return (_item instanceof Weapon); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise. - */ - public boolean isArmor() - { - return (_item instanceof Armor); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - public boolean isEtcItem() - { - return (_item instanceof EtcItem); - } - - /** - * @return the name of the item - */ - public String getItemName() - { - return _item.getName(); - } - - /** - * @return the augmentation If. - */ - public VariationInstance getAugmentation() - { - return _augmentation; - } - - /** - * @return the name of the item - */ - public String getName() - { - return _item.getName(); - } - - public int getCustomType1() - { - return _customType1; - } - - public int getCustomType2() - { - return _customType2; - } - - public int getMana() - { - return _mana; - } - - public byte getAttackElementType() - { - return _elemAtkType; - } - - public int getAttackElementPower() - { - return _elemAtkPower; - } - - public int getElementDefAttr(byte i) - { - return _elemDefAttr[i]; - } - - public int[] getEnchantOptions() - { - return _enchantOptions; - } - - public Collection getSoulCrystalOptions() - { - return _soulCrystalOptions; - } - - public Collection getSoulCrystalSpecialOptions() - { - return _soulCrystalSpecialOptions; - } - - public int getTime() - { - return _time; - } - - /** - * @return the name of the item - */ - @Override - public String toString() - { - return _item.toString(); - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Weapon.java deleted file mode 100644 index 85bb22d23b..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is dedicated to the management of weapons. - */ -public class Weapon extends ItemTemplate -{ - private WeaponType _type; - private boolean _isMagicWeapon; - private int _soulShotCount; - private int _spiritShotCount; - private int _mpConsume; - private int _baseAttackRange; - private int _baseAttackRadius; - private int _baseAttackAngle; - private int _changeWeaponId; - - private int _reducedSoulshot; - private int _reducedSoulshotChance; - - private int _reducedMpConsume; - private int _reducedMpConsumeChance; - - private boolean _isForceEquip; - private boolean _isAttackWeapon; - private boolean _useWeaponSkillsOnly; - - /** - * Constructor for Weapon. - * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. - */ - public Weapon(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_WEAPON; - _isMagicWeapon = set.getBoolean("is_magic_weapon", false); - _soulShotCount = set.getInt("soulshots", 0); - _spiritShotCount = set.getInt("spiritshots", 0); - _mpConsume = set.getInt("mp_consume", 0); - _baseAttackRange = set.getInt("attack_range", 40); - final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) - { - _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); - } - else - { - _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 - } - - final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); - _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; - _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; - - final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); - _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; - _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; - _changeWeaponId = set.getInt("change_weaponId", 0); - _isForceEquip = set.getBoolean("isForceEquip", false); - _isAttackWeapon = set.getBoolean("isAttackWeapon", true); - _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); - } - - /** - * @return the type of Weapon - */ - @Override - public WeaponType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - @Override - public boolean isWeapon() - { - return true; - } - - /** - * @return {@code true} if the weapon is magic, {@code false} otherwise. - */ - @Override - public boolean isMagicWeapon() - { - return _isMagicWeapon; - } - - /** - * @return the quantity of SoulShot used. - */ - public int getSoulShotCount() - { - return _soulShotCount; - } - - /** - * @return the quantity of SpiritShot used. - */ - public int getSpiritShotCount() - { - return _spiritShotCount; - } - - /** - * @return the reduced quantity of SoultShot used. - */ - public int getReducedSoulShot() - { - return _reducedSoulshot; - } - - /** - * @return the chance to use Reduced SoultShot. - */ - public int getReducedSoulShotChance() - { - return _reducedSoulshotChance; - } - - /** - * @return the MP consumption with the weapon. - */ - public int getMpConsume() - { - return _mpConsume; - } - - public int getBaseAttackRange() - { - return _baseAttackRange; - } - - public int getBaseAttackRadius() - { - return _baseAttackRadius; - } - - public int getBaseAttackAngle() - { - return _baseAttackAngle; - } - - /** - * @return the reduced MP consumption with the weapon. - */ - public int getReducedMpConsume() - { - return _reducedMpConsume; - } - - /** - * @return the chance to use getReducedMpConsume() - */ - public int getReducedMpConsumeChance() - { - return _reducedMpConsumeChance; - } - - /** - * @return the Id in which weapon this weapon can be changed. - */ - public int getChangeWeaponId() - { - return _changeWeaponId; - } - - /** - * @return {@code true} if the weapon is force equip, {@code false} otherwise. - */ - public boolean isForceEquip() - { - return _isForceEquip; - } - - /** - * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. - */ - public boolean isAttackWeapon() - { - return _isAttackWeapon; - } - - /** - * @return {@code true} if the weapon is skills only, {@code false} otherwise. - */ - public boolean useWeaponSkillsOnly() - { - return _useWeaponSkillsOnly; - } - - /** - * @param caster the Creature pointing out the caster - * @param target the Creature pointing out the target - * @param trigger - * @param type - */ - public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) - { - forEachSkill(type, holder -> - { - final Skill skill = holder.getSkill(); - if (Rnd.get(100) >= holder.getChance()) - { - return; - } - - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // Trigger only if both are good or bad magic. - if (trigger.isBad() != skill.isBad()) - { - return; - } - - // No Trigger if not Magic Skill or is toggle - if (trigger.isMagic() != skill.isMagic()) - { - return; - } - - // No Trigger if skill is toggle - if (trigger.isToggle()) - { - return; - } - - if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) - { - return; - } - } - - // Skill condition not met - if (!skill.checkCondition(caster, target)) - { - return; - } - - skill.activateSkill(caster, target); - - // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // notify quests of a skill use - if (caster.isPlayer()) - { - World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); - } - if (caster.isPlayer()) - { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); - sm.addSkillName(skill); - caster.sendPacket(sm); - } - } - }); - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java deleted file mode 100644 index a568389489..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ /dev/null @@ -1,558 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author UnAfraid - */ -public class AppearanceStone -{ - private final int _id; - private final int _cost; - private final int _visualId; - private final long _lifeTime; - private final AppearanceType _type; - private final WeaponType _weaponType; - private final ArmorType _armorType; - private final AppearanceHandType _handType; - private final AppearanceMagicType _magicType; - private List _crystalTypes; - private List _targetTypes; - private List _bodyParts; - private List _races; - private List _racesNot; - private List _allVisualIds; - - public AppearanceStone(StatSet set) - { - _id = set.getInt("id"); - _visualId = set.getInt("visualId", 0); - _cost = set.getInt("cost", 0); - _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); - _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); - _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); - _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); - _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); - _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); - - final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); - if (targetType != AppearanceTargetType.NONE) - { - addTargetType(targetType); - } - - // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. - final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); - - // If no crystal type is defined, we must add all defaults. - if (crystalType == null) - { - switch (targetType) - { - case ACCESSORY: - case ALL: - { - addCrystalType(CrystalType.NONE); - // fallthrough - } - case WEAPON: - case ARMOR: - { - for (CrystalType cryType : CrystalType.values()) - { - if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) - { - addCrystalType(cryType); - } - } - } - } - } - else - { - addCrystalType(crystalType); - } - - final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); - if (bodyPart != ItemTemplate.SLOT_NONE) - { - addBodyPart(bodyPart); - } - - final Race race = set.getEnum("race", Race.class, Race.NONE); - if (race != Race.NONE) - { - addRace(race); - } - - final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); - if (raceNot != Race.NONE) - { - addRaceNot(raceNot); - } - } - - public int getId() - { - return _id; - } - - public int getVisualId() - { - return _visualId; - } - - public int getCost() - { - return _cost; - } - - public long getLifeTime() - { - return _lifeTime; - } - - public AppearanceType getType() - { - return _type; - } - - public WeaponType getWeaponType() - { - return _weaponType; - } - - public ArmorType getArmorType() - { - return _armorType; - } - - public AppearanceHandType getHandType() - { - return _handType; - } - - public AppearanceMagicType getMagicType() - { - return _magicType; - } - - public void addCrystalType(CrystalType type) - { - if (_crystalTypes == null) - { - _crystalTypes = new ArrayList<>(); - } - _crystalTypes.add(type); - } - - public List getCrystalTypes() - { - return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); - } - - public void addTargetType(AppearanceTargetType type) - { - if (_targetTypes == null) - { - _targetTypes = new ArrayList<>(); - } - _targetTypes.add(type); - } - - public List getTargetTypes() - { - return _targetTypes != null ? _targetTypes : Collections.emptyList(); - } - - public void addBodyPart(long part) - { - if (_bodyParts == null) - { - _bodyParts = new ArrayList<>(); - } - _bodyParts.add(part); - } - - public void addVisualId(AppearanceHolder appearanceHolder) - { - if (_allVisualIds == null) - { - _allVisualIds = new ArrayList<>(); - } - _allVisualIds.add(appearanceHolder); - } - - public List getVisualIds() - { - return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); - } - - public List getBodyParts() - { - return _bodyParts != null ? _bodyParts : Collections.emptyList(); - } - - public void addRace(Race race) - { - if (_races == null) - { - _races = new ArrayList<>(); - } - _races.add(race); - } - - public List getRaces() - { - return _races != null ? _races : Collections.emptyList(); - } - - public void addRaceNot(Race race) - { - if (_racesNot == null) - { - _racesNot = new ArrayList<>(); - } - _racesNot.add(race); - } - - public List getRacesNot() - { - return _racesNot != null ? _racesNot : Collections.emptyList(); - } - - /** - * @param player the actor requesting to use this appearance. - * @param targetItem the item to be modified with this appearance. - * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. - */ - public boolean checkConditions(Player player, Item targetItem) - { - if (targetItem == null) - { - return false; - } - - if (getTargetTypes().isEmpty()) - { - return false; - } - - if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); - return false; - } - - switch (_type) - { - case RESTORE: - { - if (targetItem.getVisualId() == 0) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); - return false; - } - - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - default: - { - // Seems like in retail item with already changed appearance, can be changed again without being restored. - - final AppearanceTargetType targetType = getTargetTypes().get(0); - switch (targetType) - { - case NONE: - { - return false; - } - case WEAPON: - { - if (!targetItem.isWeapon()) - { - player.sendPacket(SystemMessageId.WEAPONS_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ARMOR: - { - if (!targetItem.isArmor()) - { - player.sendPacket(SystemMessageId.ARMOR_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ACCESSORY: - { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) - { - player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); - return false; - } - break; - } - case ALL: - { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (findVisualChange(targetItem) == null) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - return true; - } - } - break; - } - } - - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (_weaponType != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) - { - if (_weaponType != WeaponType.CROSSBOW) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - } - - switch (_handType) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - } - - switch (_magicType) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - if (_armorType != ArmorType.NONE) - { - switch (_armorType) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - return true; - } - - public AppearanceHolder findVisualChange(Item targetItem) - { - for (AppearanceHolder holder : _allVisualIds) - { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) - { - continue; - } - - if (holder.getWeaponType() != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) - { - if (holder.getWeaponType() != WeaponType.CROSSBOW) - { - continue; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - continue; - } - } - - switch (holder.getHandType()) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - continue; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - continue; - } - break; - } - } - - switch (holder.getMagicType()) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - continue; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - continue; - } - } - } - } - - if (holder.getArmorType() != ArmorType.NONE) - { - switch (holder.getArmorType()) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - continue; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - continue; - } - } - } - } - return holder; - } - return null; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java deleted file mode 100644 index a2897ba911..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import java.util.EnumMap; -import java.util.Map; - -import org.l2jmobius.gameserver.model.StatSet; - -/** - * @author UnAfraid - */ -public class CombinationItem -{ - private final int _itemOne; - private final int _itemTwo; - private final int _chance; - private final Map _rewards = new EnumMap<>(CombinationItemType.class); - - public CombinationItem(StatSet set) - { - _itemOne = set.getInt("one"); - _itemTwo = set.getInt("two"); - _chance = set.getInt("chance"); - } - - public int getItemOne() - { - return _itemOne; - } - - public int getItemTwo() - { - return _itemTwo; - } - - public int getChance() - { - return _chance; - } - - public void addReward(CombinationItemReward item) - { - _rewards.put(item.getType(), item); - } - - public CombinationItemReward getReward(CombinationItemType type) - { - return _rewards.get(type); - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java deleted file mode 100644 index a09b01d571..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.logging.Logger; - -import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public abstract class AbstractEnchantItem -{ - protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); - - private static final ItemType[] ENCHANT_TYPES = new ItemType[] - { - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - EtcItemType.BLESS_ENCHT_AM, - EtcItemType.BLESS_ENCHT_AM_DOWN, - EtcItemType.BLESS_ENCHT_WP, - EtcItemType.ENCHT_AM, - EtcItemType.ENCHT_WP, - EtcItemType.GIANT_ENCHT_AM, - EtcItemType.GIANT_ENCHT_WP, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - }; - - private final int _id; - private final CrystalType _grade; - private final int _minEnchantLevel; - private final int _maxEnchantLevel; - private final int _safeEnchantLevel; - private final int _randomEnchantMin; - private final int _randomEnchantMax; - private final double _bonusRate; - - public AbstractEnchantItem(StatSet set) - { - _id = set.getInt("id"); - if (getItem() == null) - { - throw new NullPointerException(); - } - else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) - { - throw new IllegalAccessError(); - } - _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); - _minEnchantLevel = set.getInt("minEnchant", 0); - _maxEnchantLevel = set.getInt("maxEnchant", 127); - _safeEnchantLevel = set.getInt("safeEnchant", 0); - _randomEnchantMin = set.getInt("randomEnchantMin", 1); - _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); - _bonusRate = set.getDouble("bonusRate", 0); - } - - /** - * @return id of current item - */ - public int getId() - { - return _id; - } - - /** - * @return bonus chance that would be added - */ - public double getBonusRate() - { - return _bonusRate; - } - - /** - * @return {@link ItemTemplate} current item/scroll - */ - public ItemTemplate getItem() - { - return ItemTable.getInstance().getTemplate(_id); - } - - /** - * @return grade of the item/scroll. - */ - public CrystalType getGrade() - { - return _grade; - } - - /** - * @return {@code true} if scroll is for weapon, {@code false} for armor - */ - public abstract boolean isWeapon(); - - /** - * @return the minimum enchant level that this scroll/item can be used with - */ - public int getMinEnchantLevel() - { - return _minEnchantLevel; - } - - /** - * @return the maximum enchant level that this scroll/item can be used with - */ - public int getMaxEnchantLevel() - { - return _maxEnchantLevel; - } - - /** - * @return the safe enchant level of this scroll/item - */ - public int getSafeEnchant() - { - return _safeEnchantLevel; - } - - /** - * @return the minimum random enchant level of this scroll/item - */ - public int getRandomEnchantMin() - { - return _randomEnchantMin; - } - - /** - * @return the maximum random enchant level of this scroll/item - */ - public int getRandomEnchantMax() - { - return _randomEnchantMax; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem - * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise - */ - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if (itemToEnchant == null) - { - return false; - } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) - { - return false; - } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) - { - return false; - } - else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) - { - return false; - } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) - { - return false; - } - return true; - } - - /** - * @param type2 - * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise - */ - private boolean isValidItemType(int type2) - { - if (type2 == ItemTemplate.TYPE2_WEAPON) - { - return isWeapon(); - } - else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) - { - return !isWeapon(); - } - return false; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fe698d8e2a..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private long _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(long slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java deleted file mode 100644 index e2c2f6ad68..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ /dev/null @@ -1,229 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.HashSet; -import java.util.Set; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.data.xml.EnchantItemData; -import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author UnAfraid - */ -public class EnchantScroll extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isBlessedDown; - private final boolean _isSafe; - private final boolean _isGiant; - private final int _scrollGroupId; - private Set _items; - - public EnchantScroll(StatSet set) - { - super(set); - _scrollGroupId = set.getInt("scrollGroupId", 0); - - final ItemType type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN); - _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - /** - * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will reset to 0), {@code false} otherwise - */ - public boolean isBlessed() - { - return _isBlessed; - } - - /** - * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise - */ - public boolean isBlessedDown() - { - return _isBlessedDown; - } - - /** - * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise - */ - public boolean isSafe() - { - return _isSafe; - } - - public boolean isGiant() - { - return _isGiant; - } - - /** - * @return id of scroll group that should be used - */ - public int getScrollGroupId() - { - return _scrollGroupId; - } - - /** - * Enforces current scroll to use only those items as possible items to enchant - * @param itemId - */ - public void addItem(int itemId) - { - if (_items == null) - { - _items = new HashSet<>(); - } - _items.add(itemId); - } - - public Set getItems() - { - return _items; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem the support item used when enchanting (can be null) - * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise - */ - @Override - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if ((_items != null) && !_items.contains(itemToEnchant.getId())) - { - return false; - } - else if ((supportItem != null)) - { - if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed())) - { - return false; - } - else if ((isBlessedDown() && !supportItem.isBlessed()) || (!isBlessedDown() && supportItem.isBlessed())) - { - return false; - } - else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant())) - { - return false; - } - else if (!supportItem.isValid(itemToEnchant, supportItem)) - { - return false; - } - else if (supportItem.isWeapon() != isWeapon()) - { - return false; - } - } - if (_items == null) - { - for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls()) - { - if (scroll.getId() == getId()) - { - continue; - } - final Set scrollItems = scroll.getItems(); - if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId())) - { - return false; - } - } - } - return super.isValid(itemToEnchant, supportItem); - } - - /** - * @param player - * @param enchantItem - * @return the chance of current scroll's group. - */ - public double getChance(Player player, Item enchantItem) - { - if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); - return -1; - } - - final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); - if (group == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); - return -1; - } - - if ((getSafeEnchant() > 0) && (enchantItem.getEnchantLevel() < getSafeEnchant())) - { - return 100; - } - - return group.getChance(enchantItem.getEnchantLevel()); - } - - /** - * @param player - * @param enchantItem - * @param supportItem - * @return the total chance for success rate of this scroll - */ - public EnchantResultType calculateSuccess(Player player, Item enchantItem, EnchantSupportItem supportItem) - { - if (!isValid(enchantItem, supportItem)) - { - return EnchantResultType.ERROR; - } - - final double chance = getChance(player, enchantItem); - if (chance == -1) - { - return EnchantResultType.ERROR; - } - - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); - final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; - final double bonusRate = getBonusRate(); - final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; - final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100); - final double random = 100 * Rnd.nextDouble(); - final boolean success = (random < finalChance); - return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java deleted file mode 100644 index 13d6b5a2ee..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public class EnchantSupportItem extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isGiant; - private final ItemType type; - - public EnchantSupportItem(StatSet set) - { - super(set); - type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - public boolean isBlessed() - { - return _isBlessed; - } - - public boolean isGiant() - { - return _isGiant; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java deleted file mode 100644 index d059efd025..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Crystal Type enumerated. - * @author Adry_85 - */ -public enum CrystalType -{ - NONE(0, 0, 0, 0), - D(1, 1458, 11, 90), - C(2, 1459, 6, 45), - B(3, 1460, 11, 67), - A(4, 1461, 20, 145), - S(5, 1462, 25, 250), - S80(6, 1462, 25, 250), - S84(7, 1462, 25, 250), - R(8, 17371, 30, 500), - R95(9, 17371, 30, 500), - R99(10, 17371, 30, 500), - EVENT(11, 0, 0, 0); - - private final int _level; - private final int _crystalId; - private final int _crystalEnchantBonusArmor; - private final int _crystalEnchantBonusWeapon; - - CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) - { - _level = level; - _crystalId = crystalId; - _crystalEnchantBonusArmor = crystalEnchantBonusArmor; - _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; - } - - /** - * Gets the crystal type ID. - * @return the crystal type ID - */ - public int getLevel() - { - return _level; - } - - /** - * Gets the item ID of the crystal. - * @return the item ID of the crystal - */ - public int getCrystalId() - { - return _crystalId; - } - - public int getCrystalEnchantBonusArmor() - { - return _crystalEnchantBonusArmor; - } - - public int getCrystalEnchantBonusWeapon() - { - return _crystalEnchantBonusWeapon; - } - - public boolean isGreater(CrystalType crystalType) - { - return getLevel() > crystalType.getLevel(); - } - - public boolean isLesser(CrystalType crystalType) - { - return getLevel() < crystalType.getLevel(); - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java deleted file mode 100644 index b352bd7fc0..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * EtcItem Type enumerated. - */ -public enum EtcItemType implements ItemType -{ - NONE, - SCROLL, - ARROW, - POTION, - SPELLBOOK, - RECIPE, - MATERIAL, - PET_COLLAR, - CASTLE_GUARD, - DYE, - SEED, - SEED2, - HARVEST, - LOTTO, - RACE_TICKET, - TICKET_OF_LORD, - LURE, - CROP, - MATURECROP, - ENCHT_WP, - ENCHT_AM, - GIANT_ENCHT_WP, - GIANT_ENCHT_AM, - BLESS_ENCHT_WP, - BLESS_ENCHT_AM, - BLESS_ENCHT_AM_DOWN, - COUPON, - ELIXIR, - ENCHT_ATTR, - ENCHT_ATTR_CURSED, - BOLT, - ENCHT_ATTR_INC_PROP_ENCHT_WP, - ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_RUNE, - ENCHT_ATTRT_RUNE_SELECT, - TELEPORTBOOKMARK, - CHANGE_ATTR, - SOULSHOT, - SHAPE_SHIFTING_WP, - BLESS_SHAPE_SHIFTING_WP, - // EIT_RESTORE_SHAPE_SHIFTING_WP, - SHAPE_SHIFTING_WP_FIXED, - SHAPE_SHIFTING_AM, - BLESS_SHAPE_SHIFTING_AM, - SHAPE_SHIFTING_AM_FIXED, - SHAPE_SHIFTING_HAIRACC, - BLESS_SHAPE_SHIFTING_HAIRACC, - SHAPE_SHIFTING_HAIRACC_FIXED, - RESTORE_SHAPE_SHIFTING_WP, - RESTORE_SHAPE_SHIFTING_AM, - RESTORE_SHAPE_SHIFTING_HAIRACC, - RESTORE_SHAPE_SHIFTING_ALLITEM, - BLESS_INC_PROP_ENCHT_WP, - BLESS_INC_PROP_ENCHT_AM, - CARD_EVENT, - SHAPE_SHIFTING_ALLITEM_FIXED, - MULTI_ENCHT_WP, - MULTI_ENCHT_AM, - MULTI_INC_PROB_ENCHT_WP, - MULTI_INC_PROB_ENCHT_AM, - SOUL_CRYSTAL, - ENSOUL_STONE; - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return 0; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c807e1298e..0fcb8c33e4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 5bf10abc0f..7929fbbe60 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java index 7d30237cb1..d9c41811d2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java index 80eec709d8..1e18bcb9ad 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 527e0b0938..f93380fc15 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 54907880aa..63f20c77b2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -39,11 +39,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index ec7537f935..4c7fa317a0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 98ad03f40d..5e9d4175d5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 38a7116383..ff0ad75b8a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index c1cac0d20a..02c4f00cf6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 1839afb5ce..334fb9252a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 7109a54ed1..5df6b208a3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index 165f9b4668..80e30184ff 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index df3acc3df1..7c51b0ad38 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index bab0af38a8..1c31ff4a11 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index cfb6455ad0..31d29ef3dd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index f467c9e4c3..e25524223a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index a397ed5ef8..99e497af54 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -52,8 +52,8 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index dc02d363c8..ea86074f0e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 543774b24c..e1c584d405 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 8e4db9d92c..a7e3f28ed6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 0d59d2ff65..e8d7efa6b0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 9054640b60..2f12cc278e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 2ca0f283f9..4f351a636b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 6cc03e2c2b..48cdb8e80b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index db5ba0efb5..84ae58c9f8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 21dcd2d13d..9565b3e5ca 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 6b1a6a94e8..1b20e2e248 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 29f7828f27..a9fd8d923a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 12bc7c708d..79e1193ac0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index ce98ab493d..d0add3fa49 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 595da81538..ab9f0c33f7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 945ff531e4..b9c3900403 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 1ee323a63c..7da966ce9f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 989d2e582f..2c715b4efb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d7fcffbdb5..4468b67642 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index ce66388a02..ecb0ab9738 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index de4094b252..db5981de3d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 60cfa6b927..6d1eea218a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 61920f471b..f89be1cfcb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index ff361e97a4..1840fcded7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 17fa6aeaf2..f02aaa9ace 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 3ec19e6e89..1e392c2ff7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 81e3a8f4c9..7e89bd6ed3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index e7a8e8baf6..7fbd7ebecb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 56cf3b84cc..b9a7aadbf7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 59c63fceca..acee799091 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 25c9792ec1..3220827fbb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index a4f0ecaefb..d5690408da 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51cd76618e..af8b12547e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 38bda2e6fb..e9cd6a88b8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 61fd93e55c..6063a54535 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 12359bcd17..2cea176d69 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 93588924fe..077f33cb49 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 07725028a6..76375a86f7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c9e5eabc7..ef1d37297e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index e4fb9e4160..b65005003d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 51abfa9d3e..f49138fafe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 4bd0a38bda..7e0614b359 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 6d0df16c27..0e6e64c7b2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 61a01d067c..658087380a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 84bc5a6eba..3800940bac 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index b79342c0a8..3a780986a0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index bd768c74e2..c4598a72e6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index a5616075a6..e1da19cc8f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ced39204d3..fbb5c84dfe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4068629bde..d05590cbde 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index d8f88333df..df50db952f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 0dc656cef6..2d352ea5cd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c742d534c4..c59568bf1d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index a22b36335e..35ca986d35 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 271ec4401b..37150ec357 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 6b8cd1358f..c32d4f7c04 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java index 3c87faec44..f61481565a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.vip; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/DocumentBase.java index 65e18e4a0e..bcbe96ad19 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -134,9 +137,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java index 5022bbea18..2bc3798609 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/DimensionalMerchant/DimensionalMerchant.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SiegeGuards.java index 8ac4fe72af..c9ca7df743 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index fa45b28c67..42d382f269 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index dd4215411e..a8e6c06eed 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 418ed93b2a..4081019df2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 5b1db54836..e7113941ec 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index f73f3c2e73..5d3caadfd5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 6a67c2d642..2e5b2846bf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index ef698d3144..98c614b7e5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index e1681d19a4..8e1d2e4ebd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 4e5a8d7aaf..1950403a0d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index 1d104a4069..bb6ed54b11 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 6e043ac66c..f5c8d5972d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 19226dce0f..6cd820aedf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 437b502a95..b8985f0fef 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 277a03c294..c98e55ac10 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index 1866a34d94..b7c74b3b74 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 7f55fdc9ed..7e0edf65b8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 1712fe6e34..da6af99db9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 28b0f453fc..5c2f25e7f2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 2ed9c1c346..7f5e0e87a1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index ebbd33bda0..f952b58fa2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 94958b7956..bd1cbe6e09 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 3f5e92bb2e..65bd99edef 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 1bb129993f..3cfcc73e45 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hp.java index ceb2e22058..6d6bc006aa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index f0dcef68c8..a503aab636 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 02468039cf..742f98e38b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index 8bbb0e59a5..b995cc61c1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 742ca00283..3d97c9ac22 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 3eb4d77710..8b4d315b50 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 658563aca3..6d5cc2cb9b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index a88c6c50c5..0aa5cb3e1f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index aaa9641567..721bf8ce08 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index 1e04447a61..80dd39470d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6f313482ab..54230f39a1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 090580340e..8df6b0b267 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 3698b03a60..4f9880d377 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b4ea6e761f..bfc5324c4d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 83860039e2..a22aaf477d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VipUp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VipUp.java index 9cf1267bbb..f716953da2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VipUp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VipUp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java index ad487044b9..db8516fac9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ElementalSpirit; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index ecb73b365e..30e5fd51af 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 80351144d6..44599b2555 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index ba621c653f..f553a0c846 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 9b16668969..119fe1f81e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index abf3b47d43..d0c1cf040c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 3ae04b22f4..c32e1327ea 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index d8f0338bc7..f9367b9386 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 02629d5d34..e17c4d3c90 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index c6d8ec7a1b..1f44066740 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 98ae8c4eaf..353347df87 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index 3988e77104..587f809dc9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 77b9a03185..c0d47bc8de 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java index bb78cafa1c..670e0a7192 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/ItemTable.java index 9182d52fcc..94b4547625 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index 313709ab07..4b2cf3b555 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 0f8815bcc4..475f0085d8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index d134fe859e..c57e62c683 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index e131a0f0e5..3359c09da3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 0cb9fed9fa..e07f7d9f64 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index 1b5d73308d..4ed0600683 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 0f7be781b2..7bc7be8487 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index ba3ab89b07..20d23bc7fc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 03cb8145be..5cba56b98c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -35,9 +35,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index ce03808800..7799768d15 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ArmorSet.java index 2a57f20a10..6b504526ef 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CombatFlag.java index e726f912f1..e0487f9079 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 142e7874c0..31885961ce 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ItemInfo.java index 4ae146eff9..6ca77262c5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -24,9 +24,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java index ec67ca4a4a..5244307c22 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java @@ -45,8 +45,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java index d199976edc..a9fd529ecc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TradeItem.java index abbe536fe5..dbb24da19f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TradeList.java index bbafcb1416..bea714862c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java index b3e2469c24..1c5b3588c3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -66,8 +66,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java index a90d06e762..5b7b51dc6e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -116,12 +116,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java index fa66dfe236..1b015f1bff 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -75,8 +75,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java index 4c9e84fd03..98b7da1c24 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -240,22 +240,22 @@ import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Summon.java index c968c49516..7a650abdc5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 2dd9a62da6..ed26029abd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index 6d0c4d66fa..2ad4775ebe 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b621ac99a1..b2b77ee360 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index 99060558ba..4552b070ca 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 5e30a0b3cd..2201b3c66c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 29208b2b65..8e5328b099 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index da5ff96580..87cb594bc9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -40,8 +40,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.vip.VipManager; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9f908898ea..ebdbe02899 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index d60e1343b9..1f55ed1bae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 2e75866e00..0b472089a8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index fcd8e14da5..2613a1847b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index fc9320c7a7..5ccfc2ab1d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.SoulType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index a5fea7c6f6..347f281026 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index dc2add2a3a..8c8b2b019d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -130,15 +130,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index 92bce4268b..14cccac24d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 79c69f739d..41f554b9e0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index b86121305d..b18ff0fce9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Armor.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Armor.java new file mode 100644 index 0000000000..c2d573ea62 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -0,0 +1,92 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.ArmorType; + +/** + * This class is dedicated to the management of armors. + */ +public class Armor extends ItemTemplate +{ + private ArmorType _type; + + /** + * Constructor for Armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. + */ + public Armor(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); + + final long bodyPart = getBodyPart(); + if (bodyPart == ItemTemplate.SLOT_ARTIFACT) + { + _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; + _type2 = ItemTemplate.TYPE2_ACCESSORY; + } + else if ((bodyPart == ItemTemplate.SLOT_NECK) || ((bodyPart & ItemTemplate.SLOT_L_EAR) != 0) || ((bodyPart & ItemTemplate.SLOT_L_FINGER) != 0) || ((bodyPart & ItemTemplate.SLOT_R_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_L_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_ARTIFACT_BOOK) != 0)) + { + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_ACCESSORY; + } + else + { + if ((_type == ArmorType.NONE) && (getBodyPart() == ItemTemplate.SLOT_L_HAND)) + { + _type = ArmorType.SHIELD; + } + _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; + _type2 = ItemTemplate.TYPE2_SHIELD_ARMOR; + } + } + + /** + * @return the type of the armor. + */ + @Override + public ArmorType getItemType() + { + return _type; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise + */ + @Override + public boolean isArmor() + { + return true; + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Henna.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Henna.java new file mode 100644 index 0000000000..d029309b0f --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -0,0 +1,171 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; + +/** + * Class for the Henna object. + * @author Zoey76 + */ +public class Henna +{ + private final int _dyeId; + private final int _dyeItemId; + private final Map _baseStats = new HashMap<>(); + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final int _duration; + private final List _skills; + private final List _wearClass; + + public Henna(StatSet set) + { + _dyeId = set.getInt("dyeId"); + _dyeItemId = set.getInt("dyeItemId"); + _baseStats.put(BaseStat.STR, set.getInt("str", 0)); + _baseStats.put(BaseStat.CON, set.getInt("con", 0)); + _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); + _baseStats.put(BaseStat.INT, set.getInt("int", 0)); + _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); + _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _duration = set.getInt("duration", -1); + _skills = new ArrayList<>(); + _wearClass = new ArrayList<>(); + } + + /** + * @return the dye Id. + */ + public int getDyeId() + { + return _dyeId; + } + + /** + * @return the item Id, required for this dye. + */ + public int getDyeItemId() + { + return _dyeItemId; + } + + public int getBaseStats(BaseStat stat) + { + return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); + } + + public Map getBaseStats() + { + return _baseStats; + } + + /** + * @return the wear fee, cost for adding this dye to the player. + */ + public int getWearFee() + { + return _wearFee; + } + + /** + * @return the wear count, the required count to add this dye to the player. + */ + public int getWearCount() + { + return _wearCount; + } + + /** + * @return the cancel fee, cost for removing this dye from the player. + */ + public int getCancelFee() + { + return _cancelFee; + } + + /** + * @return the cancel count, the retrieved amount of dye items after removing the dye. + */ + public int getCancelCount() + { + return _cancelCount; + } + + /** + * @return the duration of this dye. + */ + public int getDuration() + { + return _duration; + } + + /** + * @param skillList the list of skills related to this dye. + */ + public void setSkills(List skillList) + { + _skills.addAll(skillList); + } + + /** + * @return the skills related to this dye. + */ + public List getSkills() + { + return _skills; + } + + /** + * @return the list with the allowed classes to wear this dye. + */ + public List getAllowedWearClass() + { + return _wearClass; + } + + /** + * @param classId the class trying to wear this dye. + * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. + */ + public boolean isAllowedClass(ClassId classId) + { + return _wearClass.contains(classId); + } + + /** + * @param wearClassIds the list of classes that can wear this dye. + */ + public void setWearClassIds(List wearClassIds) + { + _wearClass.addAll(wearClassIds); + } +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index 499de2a7d7..28646ed3de 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java new file mode 100644 index 0000000000..b289fa70ae --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -0,0 +1,300 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.Collection; +import java.util.Objects; + +import org.l2jmobius.gameserver.enums.AttributeType; +import org.l2jmobius.gameserver.model.VariationInstance; +import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * This class contains Item
+ * Use to sort Item of : + *
    + *
  • Armor
    • + *
  • EtcItem
    • + *
  • Weapon
    • + *
+ * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ + */ +public class WarehouseItem +{ + private final ItemTemplate _item; + private final int _object; + private final long _count; + private final int _owner; + private final int _locationSlot; + private final int _enchant; + private final CrystalType _grade; + private final VariationInstance _augmentation; + private final int _customType1; + private final int _customType2; + private final int _mana; + + private byte _elemAtkType = -2; + private int _elemAtkPower = 0; + + private final int[] _elemDefAttr = + { + 0, + 0, + 0, + 0, + 0, + 0 + }; + + private final int[] _enchantOptions; + private final Collection _soulCrystalOptions; + private final Collection _soulCrystalSpecialOptions; + + private final int _time; + + public WarehouseItem(Item item) + { + Objects.requireNonNull(item); + _item = item.getItem(); + _object = item.getObjectId(); + _count = item.getCount(); + _owner = item.getOwnerId(); + _locationSlot = item.getLocationSlot(); + _enchant = item.getEnchantLevel(); + _customType1 = item.getCustomType1(); + _customType2 = item.getCustomType2(); + _grade = item.getItem().getCrystalType(); + _augmentation = item.getAugmentation(); + _mana = item.getMana(); + _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; + _elemAtkType = item.getAttackAttributeType().getClientId(); + _elemAtkPower = item.getAttackAttributePower(); + for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) + { + _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); + } + _enchantOptions = item.getEnchantOptions(); + _soulCrystalOptions = item.getSpecialAbilities(); + _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); + } + + /** + * @return the item. + */ + public ItemTemplate getItem() + { + return _item; + } + + /** + * @return the unique objectId. + */ + public int getObjectId() + { + return _object; + } + + /** + * @return the owner. + */ + public int getOwnerId() + { + return _owner; + } + + /** + * @return the location slot. + */ + public int getLocationSlot() + { + return _locationSlot; + } + + /** + * @return the count. + */ + public long getCount() + { + return _count; + } + + /** + * @return the first type. + */ + public int getType1() + { + return _item.getType1(); + } + + /** + * @return the second type. + */ + public int getType2() + { + return _item.getType2(); + } + + /** + * @return the second type. + */ + public ItemType getItemType() + { + return _item.getItemType(); + } + + /** + * @return the ItemId. + */ + public int getItemId() + { + return _item.getId(); + } + + /** + * @return the part of body used with this item. + */ + public long getBodyPart() + { + return _item.getBodyPart(); + } + + /** + * @return the enchant level. + */ + public int getEnchantLevel() + { + return _enchant; + } + + /** + * @return the item grade + */ + public CrystalType getItemGrade() + { + return _grade; + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + public boolean isWeapon() + { + return (_item instanceof Weapon); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise. + */ + public boolean isArmor() + { + return (_item instanceof Armor); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + public boolean isEtcItem() + { + return (_item instanceof EtcItem); + } + + /** + * @return the name of the item + */ + public String getItemName() + { + return _item.getName(); + } + + /** + * @return the augmentation If. + */ + public VariationInstance getAugmentation() + { + return _augmentation; + } + + /** + * @return the name of the item + */ + public String getName() + { + return _item.getName(); + } + + public int getCustomType1() + { + return _customType1; + } + + public int getCustomType2() + { + return _customType2; + } + + public int getMana() + { + return _mana; + } + + public byte getAttackElementType() + { + return _elemAtkType; + } + + public int getAttackElementPower() + { + return _elemAtkPower; + } + + public int getElementDefAttr(byte i) + { + return _elemDefAttr[i]; + } + + public int[] getEnchantOptions() + { + return _enchantOptions; + } + + public Collection getSoulCrystalOptions() + { + return _soulCrystalOptions; + } + + public Collection getSoulCrystalSpecialOptions() + { + return _soulCrystalSpecialOptions; + } + + public int getTime() + { + return _time; + } + + /** + * @return the name of the item + */ + @Override + public String toString() + { + return _item.toString(); + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Weapon.java new file mode 100644 index 0000000000..4599d5047f --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -0,0 +1,311 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.enums.ItemSkillType; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is dedicated to the management of weapons. + */ +public class Weapon extends ItemTemplate +{ + private WeaponType _type; + private boolean _isMagicWeapon; + private int _soulShotCount; + private int _spiritShotCount; + private int _mpConsume; + private int _baseAttackRange; + private int _baseAttackRadius; + private int _baseAttackAngle; + private int _changeWeaponId; + + private int _reducedSoulshot; + private int _reducedSoulshotChance; + + private int _reducedMpConsume; + private int _reducedMpConsumeChance; + + private boolean _isForceEquip; + private boolean _isAttackWeapon; + private boolean _useWeaponSkillsOnly; + + /** + * Constructor for Weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. + */ + public Weapon(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_WEAPON; + _isMagicWeapon = set.getBoolean("is_magic_weapon", false); + _soulShotCount = set.getInt("soulshots", 0); + _spiritShotCount = set.getInt("spiritshots", 0); + _mpConsume = set.getInt("mp_consume", 0); + _baseAttackRange = set.getInt("attack_range", 40); + final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) + { + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + } + else + { + _baseAttackRadius = 40; + _baseAttackAngle = 240; // 360 - 120 + } + + final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); + _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; + _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; + + final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); + _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; + _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; + _changeWeaponId = set.getInt("change_weaponId", 0); + _isForceEquip = set.getBoolean("isForceEquip", false); + _isAttackWeapon = set.getBoolean("isAttackWeapon", true); + _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); + } + + /** + * @return the type of Weapon + */ + @Override + public WeaponType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + @Override + public boolean isWeapon() + { + return true; + } + + /** + * @return {@code true} if the weapon is magic, {@code false} otherwise. + */ + @Override + public boolean isMagicWeapon() + { + return _isMagicWeapon; + } + + /** + * @return the quantity of SoulShot used. + */ + public int getSoulShotCount() + { + return _soulShotCount; + } + + /** + * @return the quantity of SpiritShot used. + */ + public int getSpiritShotCount() + { + return _spiritShotCount; + } + + /** + * @return the reduced quantity of SoultShot used. + */ + public int getReducedSoulShot() + { + return _reducedSoulshot; + } + + /** + * @return the chance to use Reduced SoultShot. + */ + public int getReducedSoulShotChance() + { + return _reducedSoulshotChance; + } + + /** + * @return the MP consumption with the weapon. + */ + public int getMpConsume() + { + return _mpConsume; + } + + public int getBaseAttackRange() + { + return _baseAttackRange; + } + + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + + /** + * @return the reduced MP consumption with the weapon. + */ + public int getReducedMpConsume() + { + return _reducedMpConsume; + } + + /** + * @return the chance to use getReducedMpConsume() + */ + public int getReducedMpConsumeChance() + { + return _reducedMpConsumeChance; + } + + /** + * @return the Id in which weapon this weapon can be changed. + */ + public int getChangeWeaponId() + { + return _changeWeaponId; + } + + /** + * @return {@code true} if the weapon is force equip, {@code false} otherwise. + */ + public boolean isForceEquip() + { + return _isForceEquip; + } + + /** + * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. + */ + public boolean isAttackWeapon() + { + return _isAttackWeapon; + } + + /** + * @return {@code true} if the weapon is skills only, {@code false} otherwise. + */ + public boolean useWeaponSkillsOnly() + { + return _useWeaponSkillsOnly; + } + + /** + * @param caster the Creature pointing out the caster + * @param target the Creature pointing out the target + * @param trigger + * @param type + */ + public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) + { + forEachSkill(type, holder -> + { + final Skill skill = holder.getSkill(); + if (Rnd.get(100) >= holder.getChance()) + { + return; + } + + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // Trigger only if both are good or bad magic. + if (trigger.isBad() != skill.isBad()) + { + return; + } + + // No Trigger if not Magic Skill or is toggle + if (trigger.isMagic() != skill.isMagic()) + { + return; + } + + // No Trigger if skill is toggle + if (trigger.isToggle()) + { + return; + } + + if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) + { + return; + } + } + + // Skill condition not met + if (!skill.checkCondition(caster, target, true)) + { + return; + } + + skill.activateSkill(caster, target); + + // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // notify quests of a skill use + if (caster.isPlayer()) + { + World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); + } + if (caster.isPlayer()) + { + final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); + sm.addSkillName(skill); + caster.sendPacket(sm); + } + } + }); + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java new file mode 100644 index 0000000000..610e720125 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -0,0 +1,558 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.network.SystemMessageId; + +/** + * @author UnAfraid + */ +public class AppearanceStone +{ + private final int _id; + private final int _cost; + private final int _visualId; + private final long _lifeTime; + private final AppearanceType _type; + private final WeaponType _weaponType; + private final ArmorType _armorType; + private final AppearanceHandType _handType; + private final AppearanceMagicType _magicType; + private List _crystalTypes; + private List _targetTypes; + private List _bodyParts; + private List _races; + private List _racesNot; + private List _allVisualIds; + + public AppearanceStone(StatSet set) + { + _id = set.getInt("id"); + _visualId = set.getInt("visualId", 0); + _cost = set.getInt("cost", 0); + _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); + _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); + _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); + _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); + _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); + _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); + + final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); + if (targetType != AppearanceTargetType.NONE) + { + addTargetType(targetType); + } + + // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. + final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); + + // If no crystal type is defined, we must add all defaults. + if (crystalType == null) + { + switch (targetType) + { + case ACCESSORY: + case ALL: + { + addCrystalType(CrystalType.NONE); + // fallthrough + } + case WEAPON: + case ARMOR: + { + for (CrystalType cryType : CrystalType.values()) + { + if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) + { + addCrystalType(cryType); + } + } + } + } + } + else + { + addCrystalType(crystalType); + } + + final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); + if (bodyPart != ItemTemplate.SLOT_NONE) + { + addBodyPart(bodyPart); + } + + final Race race = set.getEnum("race", Race.class, Race.NONE); + if (race != Race.NONE) + { + addRace(race); + } + + final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); + if (raceNot != Race.NONE) + { + addRaceNot(raceNot); + } + } + + public int getId() + { + return _id; + } + + public int getVisualId() + { + return _visualId; + } + + public int getCost() + { + return _cost; + } + + public long getLifeTime() + { + return _lifeTime; + } + + public AppearanceType getType() + { + return _type; + } + + public WeaponType getWeaponType() + { + return _weaponType; + } + + public ArmorType getArmorType() + { + return _armorType; + } + + public AppearanceHandType getHandType() + { + return _handType; + } + + public AppearanceMagicType getMagicType() + { + return _magicType; + } + + public void addCrystalType(CrystalType type) + { + if (_crystalTypes == null) + { + _crystalTypes = new ArrayList<>(); + } + _crystalTypes.add(type); + } + + public List getCrystalTypes() + { + return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); + } + + public void addTargetType(AppearanceTargetType type) + { + if (_targetTypes == null) + { + _targetTypes = new ArrayList<>(); + } + _targetTypes.add(type); + } + + public List getTargetTypes() + { + return _targetTypes != null ? _targetTypes : Collections.emptyList(); + } + + public void addBodyPart(long part) + { + if (_bodyParts == null) + { + _bodyParts = new ArrayList<>(); + } + _bodyParts.add(part); + } + + public void addVisualId(AppearanceHolder appearanceHolder) + { + if (_allVisualIds == null) + { + _allVisualIds = new ArrayList<>(); + } + _allVisualIds.add(appearanceHolder); + } + + public List getVisualIds() + { + return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); + } + + public List getBodyParts() + { + return _bodyParts != null ? _bodyParts : Collections.emptyList(); + } + + public void addRace(Race race) + { + if (_races == null) + { + _races = new ArrayList<>(); + } + _races.add(race); + } + + public List getRaces() + { + return _races != null ? _races : Collections.emptyList(); + } + + public void addRaceNot(Race race) + { + if (_racesNot == null) + { + _racesNot = new ArrayList<>(); + } + _racesNot.add(race); + } + + public List getRacesNot() + { + return _racesNot != null ? _racesNot : Collections.emptyList(); + } + + /** + * @param player the actor requesting to use this appearance. + * @param targetItem the item to be modified with this appearance. + * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. + */ + public boolean checkConditions(Player player, Item targetItem) + { + if (targetItem == null) + { + return false; + } + + if (getTargetTypes().isEmpty()) + { + return false; + } + + if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); + return false; + } + + switch (_type) + { + case RESTORE: + { + if (targetItem.getVisualId() == 0) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); + return false; + } + + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + default: + { + // Seems like in retail item with already changed appearance, can be changed again without being restored. + + final AppearanceTargetType targetType = getTargetTypes().get(0); + switch (targetType) + { + case NONE: + { + return false; + } + case WEAPON: + { + if (!targetItem.isWeapon()) + { + player.sendPacket(SystemMessageId.WEAPONS_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ARMOR: + { + if (!targetItem.isArmor()) + { + player.sendPacket(SystemMessageId.ARMOR_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ACCESSORY: + { + if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + { + player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); + return false; + } + break; + } + case ALL: + { + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (findVisualChange(targetItem) == null) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + return true; + } + } + break; + } + } + + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (_weaponType != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) + { + if (_weaponType != WeaponType.CROSSBOW) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + } + + switch (_handType) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + } + + switch (_magicType) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + if (_armorType != ArmorType.NONE) + { + switch (_armorType) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + return true; + } + + public AppearanceHolder findVisualChange(Item targetItem) + { + for (AppearanceHolder holder : _allVisualIds) + { + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + { + continue; + } + + if (holder.getWeaponType() != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) + { + if (holder.getWeaponType() != WeaponType.CROSSBOW) + { + continue; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + continue; + } + } + + switch (holder.getHandType()) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + continue; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + continue; + } + break; + } + } + + switch (holder.getMagicType()) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + continue; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + continue; + } + } + } + } + + if (holder.getArmorType() != ArmorType.NONE) + { + switch (holder.getArmorType()) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + continue; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + continue; + } + } + } + } + return holder; + } + return null; + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java new file mode 100644 index 0000000000..6f73983c0e --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -0,0 +1,65 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import java.util.EnumMap; +import java.util.Map; + +import org.l2jmobius.gameserver.model.StatSet; + +/** + * @author UnAfraid + */ +public class CombinationItem +{ + private final int _itemOne; + private final int _itemTwo; + private final int _chance; + private final Map _rewards = new EnumMap<>(CombinationItemType.class); + + public CombinationItem(StatSet set) + { + _itemOne = set.getInt("one"); + _itemTwo = set.getInt("two"); + _chance = set.getInt("chance"); + } + + public int getItemOne() + { + return _itemOne; + } + + public int getItemTwo() + { + return _itemTwo; + } + + public int getChance() + { + return _chance; + } + + public void addReward(CombinationItemReward item) + { + _rewards.put(item.getType(), item); + } + + public CombinationItemReward getReward(CombinationItemType type) + { + return _rewards.get(type); + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java new file mode 100644 index 0000000000..8890655085 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -0,0 +1,210 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.logging.Logger; + +import org.l2jmobius.commons.util.CommonUtil; +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public abstract class AbstractEnchantItem +{ + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); + + private static final ItemType[] ENCHANT_TYPES = new ItemType[] + { + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + EtcItemType.BLESS_ENCHT_AM, + EtcItemType.BLESS_ENCHT_AM_DOWN, + EtcItemType.BLESS_ENCHT_WP, + EtcItemType.ENCHT_AM, + EtcItemType.ENCHT_WP, + EtcItemType.GIANT_ENCHT_AM, + EtcItemType.GIANT_ENCHT_WP, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + }; + + private final int _id; + private final CrystalType _grade; + private final int _minEnchantLevel; + private final int _maxEnchantLevel; + private final int _safeEnchantLevel; + private final int _randomEnchantMin; + private final int _randomEnchantMax; + private final double _bonusRate; + + public AbstractEnchantItem(StatSet set) + { + _id = set.getInt("id"); + if (getItem() == null) + { + throw new NullPointerException(); + } + else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) + { + throw new IllegalAccessError(); + } + _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); + _minEnchantLevel = set.getInt("minEnchant", 0); + _maxEnchantLevel = set.getInt("maxEnchant", 127); + _safeEnchantLevel = set.getInt("safeEnchant", 0); + _randomEnchantMin = set.getInt("randomEnchantMin", 1); + _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); + _bonusRate = set.getDouble("bonusRate", 0); + } + + /** + * @return id of current item + */ + public int getId() + { + return _id; + } + + /** + * @return bonus chance that would be added + */ + public double getBonusRate() + { + return _bonusRate; + } + + /** + * @return {@link ItemTemplate} current item/scroll + */ + public ItemTemplate getItem() + { + return ItemTable.getInstance().getTemplate(_id); + } + + /** + * @return grade of the item/scroll. + */ + public CrystalType getGrade() + { + return _grade; + } + + /** + * @return {@code true} if scroll is for weapon, {@code false} for armor + */ + public abstract boolean isWeapon(); + + /** + * @return the minimum enchant level that this scroll/item can be used with + */ + public int getMinEnchantLevel() + { + return _minEnchantLevel; + } + + /** + * @return the maximum enchant level that this scroll/item can be used with + */ + public int getMaxEnchantLevel() + { + return _maxEnchantLevel; + } + + /** + * @return the safe enchant level of this scroll/item + */ + public int getSafeEnchant() + { + return _safeEnchantLevel; + } + + /** + * @return the minimum random enchant level of this scroll/item + */ + public int getRandomEnchantMin() + { + return _randomEnchantMin; + } + + /** + * @return the maximum random enchant level of this scroll/item + */ + public int getRandomEnchantMax() + { + return _randomEnchantMax; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem + * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise + */ + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if (itemToEnchant == null) + { + return false; + } + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + { + return false; + } + else if (!isValidItemType(itemToEnchant.getItem().getType2())) + { + return false; + } + else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) + { + return false; + } + else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + { + return false; + } + return true; + } + + /** + * @param type2 + * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise + */ + private boolean isValidItemType(int type2) + { + if (type2 == ItemTemplate.TYPE2_WEAPON) + { + return isWeapon(); + } + else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) + { + return !isWeapon(); + } + return false; + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..1099b77054 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private long _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(long slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java new file mode 100644 index 0000000000..9a80e104b0 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -0,0 +1,229 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.HashSet; +import java.util.Set; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.data.xml.EnchantItemData; +import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author UnAfraid + */ +public class EnchantScroll extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isBlessedDown; + private final boolean _isSafe; + private final boolean _isGiant; + private final int _scrollGroupId; + private Set _items; + + public EnchantScroll(StatSet set) + { + super(set); + _scrollGroupId = set.getInt("scrollGroupId", 0); + + final ItemType type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN); + _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + /** + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will reset to 0), {@code false} otherwise + */ + public boolean isBlessed() + { + return _isBlessed; + } + + /** + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise + */ + public boolean isBlessedDown() + { + return _isBlessedDown; + } + + /** + * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise + */ + public boolean isSafe() + { + return _isSafe; + } + + public boolean isGiant() + { + return _isGiant; + } + + /** + * @return id of scroll group that should be used + */ + public int getScrollGroupId() + { + return _scrollGroupId; + } + + /** + * Enforces current scroll to use only those items as possible items to enchant + * @param itemId + */ + public void addItem(int itemId) + { + if (_items == null) + { + _items = new HashSet<>(); + } + _items.add(itemId); + } + + public Set getItems() + { + return _items; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem the support item used when enchanting (can be null) + * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise + */ + @Override + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if ((_items != null) && !_items.contains(itemToEnchant.getId())) + { + return false; + } + else if ((supportItem != null)) + { + if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed())) + { + return false; + } + else if ((isBlessedDown() && !supportItem.isBlessed()) || (!isBlessedDown() && supportItem.isBlessed())) + { + return false; + } + else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant())) + { + return false; + } + else if (!supportItem.isValid(itemToEnchant, supportItem)) + { + return false; + } + else if (supportItem.isWeapon() != isWeapon()) + { + return false; + } + } + if (_items == null) + { + for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls()) + { + if (scroll.getId() == getId()) + { + continue; + } + final Set scrollItems = scroll.getItems(); + if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId())) + { + return false; + } + } + } + return super.isValid(itemToEnchant, supportItem); + } + + /** + * @param player + * @param enchantItem + * @return the chance of current scroll's group. + */ + public double getChance(Player player, Item enchantItem) + { + if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) + { + LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); + return -1; + } + + final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); + if (group == null) + { + LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); + return -1; + } + + if ((getSafeEnchant() > 0) && (enchantItem.getEnchantLevel() < getSafeEnchant())) + { + return 100; + } + + return group.getChance(enchantItem.getEnchantLevel()); + } + + /** + * @param player + * @param enchantItem + * @param supportItem + * @return the total chance for success rate of this scroll + */ + public EnchantResultType calculateSuccess(Player player, Item enchantItem, EnchantSupportItem supportItem) + { + if (!isValid(enchantItem, supportItem)) + { + return EnchantResultType.ERROR; + } + + final double chance = getChance(player, enchantItem); + if (chance == -1) + { + return EnchantResultType.ERROR; + } + + final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; + final double bonusRate = getBonusRate(); + final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; + final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100); + final double random = 100 * Rnd.nextDouble(); + final boolean success = (random < finalChance); + return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE; + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java new file mode 100644 index 0000000000..bfe1c295da --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -0,0 +1,57 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public class EnchantSupportItem extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isGiant; + private final ItemType type; + + public EnchantSupportItem(StatSet set) + { + super(set); + type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + public boolean isBlessed() + { + return _isBlessed; + } + + public boolean isGiant() + { + return _isGiant; + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java index b196da7407..659d9f04bf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -72,15 +72,15 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java new file mode 100644 index 0000000000..c8a309674f --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -0,0 +1,88 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Crystal Type enumerated. + * @author Adry_85 + */ +public enum CrystalType +{ + NONE(0, 0, 0, 0), + D(1, 1458, 11, 90), + C(2, 1459, 6, 45), + B(3, 1460, 11, 67), + A(4, 1461, 20, 145), + S(5, 1462, 25, 250), + S80(6, 1462, 25, 250), + S84(7, 1462, 25, 250), + R(8, 17371, 30, 500), + R95(9, 17371, 30, 500), + R99(10, 17371, 30, 500), + EVENT(11, 0, 0, 0); + + private final int _level; + private final int _crystalId; + private final int _crystalEnchantBonusArmor; + private final int _crystalEnchantBonusWeapon; + + CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) + { + _level = level; + _crystalId = crystalId; + _crystalEnchantBonusArmor = crystalEnchantBonusArmor; + _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; + } + + /** + * Gets the crystal type ID. + * @return the crystal type ID + */ + public int getLevel() + { + return _level; + } + + /** + * Gets the item ID of the crystal. + * @return the item ID of the crystal + */ + public int getCrystalId() + { + return _crystalId; + } + + public int getCrystalEnchantBonusArmor() + { + return _crystalEnchantBonusArmor; + } + + public int getCrystalEnchantBonusWeapon() + { + return _crystalEnchantBonusWeapon; + } + + public boolean isGreater(CrystalType crystalType) + { + return getLevel() > crystalType.getLevel(); + } + + public boolean isLesser(CrystalType crystalType) + { + return getLevel() < crystalType.getLevel(); + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java new file mode 100644 index 0000000000..834b0c3996 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -0,0 +1,105 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * EtcItem Type enumerated. + */ +public enum EtcItemType implements ItemType +{ + NONE, + SCROLL, + ARROW, + POTION, + SPELLBOOK, + RECIPE, + MATERIAL, + PET_COLLAR, + CASTLE_GUARD, + DYE, + SEED, + SEED2, + HARVEST, + LOTTO, + RACE_TICKET, + TICKET_OF_LORD, + LURE, + CROP, + MATURECROP, + ENCHT_WP, + ENCHT_AM, + GIANT_ENCHT_WP, + GIANT_ENCHT_AM, + BLESS_ENCHT_WP, + BLESS_ENCHT_AM, + BLESS_ENCHT_AM_DOWN, + COUPON, + ELIXIR, + ENCHT_ATTR, + ENCHT_ATTR_CURSED, + BOLT, + ENCHT_ATTR_INC_PROP_ENCHT_WP, + ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_RUNE, + ENCHT_ATTRT_RUNE_SELECT, + TELEPORTBOOKMARK, + CHANGE_ATTR, + SOULSHOT, + SHAPE_SHIFTING_WP, + BLESS_SHAPE_SHIFTING_WP, + // EIT_RESTORE_SHAPE_SHIFTING_WP, + SHAPE_SHIFTING_WP_FIXED, + SHAPE_SHIFTING_AM, + BLESS_SHAPE_SHIFTING_AM, + SHAPE_SHIFTING_AM_FIXED, + SHAPE_SHIFTING_HAIRACC, + BLESS_SHAPE_SHIFTING_HAIRACC, + SHAPE_SHIFTING_HAIRACC_FIXED, + RESTORE_SHAPE_SHIFTING_WP, + RESTORE_SHAPE_SHIFTING_AM, + RESTORE_SHAPE_SHIFTING_HAIRACC, + RESTORE_SHAPE_SHIFTING_ALLITEM, + BLESS_INC_PROP_ENCHT_WP, + BLESS_INC_PROP_ENCHT_AM, + CARD_EVENT, + SHAPE_SHIFTING_ALLITEM_FIXED, + MULTI_ENCHT_WP, + MULTI_ENCHT_AM, + MULTI_INC_PROB_ENCHT_WP, + MULTI_INC_PROB_ENCHT_AM, + SOUL_CRYSTAL, + ENSOUL_STONE; + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return 0; + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 8323d4bdc7..06760564d7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index cdc3bf25eb..751bc6187f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -54,14 +54,14 @@ import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 6f6d11a97d..c8e13e1e2c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Armor.java deleted file mode 100644 index a2f1c2d3e6..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Armor.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; - -/** - * This class is dedicated to the management of armors. - */ -public class Armor extends ItemTemplate -{ - private ArmorType _type; - - /** - * Constructor for Armor. - * @param set the StatSet designating the set of couples (key,value) characterizing the armor. - */ - public Armor(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); - - final long bodyPart = getBodyPart(); - if (bodyPart == ItemTemplate.SLOT_ARTIFACT) - { - _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; - _type2 = ItemTemplate.TYPE2_ACCESSORY; - } - else if ((bodyPart == ItemTemplate.SLOT_NECK) || ((bodyPart & ItemTemplate.SLOT_L_EAR) != 0) || ((bodyPart & ItemTemplate.SLOT_L_FINGER) != 0) || ((bodyPart & ItemTemplate.SLOT_R_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_L_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_ARTIFACT_BOOK) != 0)) - { - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_ACCESSORY; - } - else - { - if ((_type == ArmorType.NONE) && (getBodyPart() == ItemTemplate.SLOT_L_HAND)) - { - _type = ArmorType.SHIELD; - } - _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; - _type2 = ItemTemplate.TYPE2_SHIELD_ARMOR; - } - } - - /** - * @return the type of the armor. - */ - @Override - public ArmorType getItemType() - { - return _type; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise - */ - @Override - public boolean isArmor() - { - return true; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Henna.java deleted file mode 100644 index 09fdb7abcb..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Henna.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.l2jmobius.gameserver.enums.ClassId; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; - -/** - * Class for the Henna object. - * @author Zoey76 - */ -public class Henna -{ - private final int _dyeId; - private final int _dyeItemId; - private final Map _baseStats = new HashMap<>(); - private final int _wearFee; - private final int _wearCount; - private final int _cancelFee; - private final int _cancelCount; - private final int _duration; - private final List _skills; - private final List _wearClass; - - public Henna(StatSet set) - { - _dyeId = set.getInt("dyeId"); - _dyeItemId = set.getInt("dyeItemId"); - _baseStats.put(BaseStat.STR, set.getInt("str", 0)); - _baseStats.put(BaseStat.CON, set.getInt("con", 0)); - _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); - _baseStats.put(BaseStat.INT, set.getInt("int", 0)); - _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); - _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _wearFee = set.getInt("wear_fee"); - _wearCount = set.getInt("wear_count"); - _cancelFee = set.getInt("cancel_fee"); - _cancelCount = set.getInt("cancel_count"); - _duration = set.getInt("duration", -1); - _skills = new ArrayList<>(); - _wearClass = new ArrayList<>(); - } - - /** - * @return the dye Id. - */ - public int getDyeId() - { - return _dyeId; - } - - /** - * @return the item Id, required for this dye. - */ - public int getDyeItemId() - { - return _dyeItemId; - } - - public int getBaseStats(BaseStat stat) - { - return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); - } - - public Map getBaseStats() - { - return _baseStats; - } - - /** - * @return the wear fee, cost for adding this dye to the player. - */ - public int getWearFee() - { - return _wearFee; - } - - /** - * @return the wear count, the required count to add this dye to the player. - */ - public int getWearCount() - { - return _wearCount; - } - - /** - * @return the cancel fee, cost for removing this dye from the player. - */ - public int getCancelFee() - { - return _cancelFee; - } - - /** - * @return the cancel count, the retrieved amount of dye items after removing the dye. - */ - public int getCancelCount() - { - return _cancelCount; - } - - /** - * @return the duration of this dye. - */ - public int getDuration() - { - return _duration; - } - - /** - * @param skillList the list of skills related to this dye. - */ - public void setSkills(List skillList) - { - _skills.addAll(skillList); - } - - /** - * @return the skills related to this dye. - */ - public List getSkills() - { - return _skills; - } - - /** - * @return the list with the allowed classes to wear this dye. - */ - public List getAllowedWearClass() - { - return _wearClass; - } - - /** - * @param classId the class trying to wear this dye. - * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. - */ - public boolean isAllowedClass(ClassId classId) - { - return _wearClass.contains(classId); - } - - /** - * @param wearClassIds the list of classes that can wear this dye. - */ - public void setWearClassIds(List wearClassIds) - { - _wearClass.addAll(wearClassIds); - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java deleted file mode 100644 index 5618132356..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ /dev/null @@ -1,300 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.Collection; -import java.util.Objects; - -import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * This class contains Item
- * Use to sort Item of : - *
    - *
  • Armor
    • - *
  • EtcItem
    • - *
  • Weapon
    • - *
- * @version $Revision: 1.7.2.2.2.5 $ $Date: 2005/04/06 18:25:18 $ - */ -public class WarehouseItem -{ - private final ItemTemplate _item; - private final int _object; - private final long _count; - private final int _owner; - private final int _locationSlot; - private final int _enchant; - private final CrystalType _grade; - private final VariationInstance _augmentation; - private final int _customType1; - private final int _customType2; - private final int _mana; - - private byte _elemAtkType = -2; - private int _elemAtkPower = 0; - - private final int[] _elemDefAttr = - { - 0, - 0, - 0, - 0, - 0, - 0 - }; - - private final int[] _enchantOptions; - private final Collection _soulCrystalOptions; - private final Collection _soulCrystalSpecialOptions; - - private final int _time; - - public WarehouseItem(Item item) - { - Objects.requireNonNull(item); - _item = item.getItem(); - _object = item.getObjectId(); - _count = item.getCount(); - _owner = item.getOwnerId(); - _locationSlot = item.getLocationSlot(); - _enchant = item.getEnchantLevel(); - _customType1 = item.getCustomType1(); - _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); - _augmentation = item.getAugmentation(); - _mana = item.getMana(); - _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; - _elemAtkType = item.getAttackAttributeType().getClientId(); - _elemAtkPower = item.getAttackAttributePower(); - for (AttributeType type : AttributeType.ATTRIBUTE_TYPES) - { - _elemDefAttr[type.getClientId()] = item.getDefenceAttribute(type); - } - _enchantOptions = item.getEnchantOptions(); - _soulCrystalOptions = item.getSpecialAbilities(); - _soulCrystalSpecialOptions = item.getAdditionalSpecialAbilities(); - } - - /** - * @return the item. - */ - public ItemTemplate getItem() - { - return _item; - } - - /** - * @return the unique objectId. - */ - public int getObjectId() - { - return _object; - } - - /** - * @return the owner. - */ - public int getOwnerId() - { - return _owner; - } - - /** - * @return the location slot. - */ - public int getLocationSlot() - { - return _locationSlot; - } - - /** - * @return the count. - */ - public long getCount() - { - return _count; - } - - /** - * @return the first type. - */ - public int getType1() - { - return _item.getType1(); - } - - /** - * @return the second type. - */ - public int getType2() - { - return _item.getType2(); - } - - /** - * @return the second type. - */ - public ItemType getItemType() - { - return _item.getItemType(); - } - - /** - * @return the ItemId. - */ - public int getItemId() - { - return _item.getId(); - } - - /** - * @return the part of body used with this item. - */ - public long getBodyPart() - { - return _item.getBodyPart(); - } - - /** - * @return the enchant level. - */ - public int getEnchantLevel() - { - return _enchant; - } - - /** - * @return the item grade - */ - public CrystalType getItemGrade() - { - return _grade; - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - public boolean isWeapon() - { - return (_item instanceof Weapon); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise. - */ - public boolean isArmor() - { - return (_item instanceof Armor); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - public boolean isEtcItem() - { - return (_item instanceof EtcItem); - } - - /** - * @return the name of the item - */ - public String getItemName() - { - return _item.getName(); - } - - /** - * @return the augmentation If. - */ - public VariationInstance getAugmentation() - { - return _augmentation; - } - - /** - * @return the name of the item - */ - public String getName() - { - return _item.getName(); - } - - public int getCustomType1() - { - return _customType1; - } - - public int getCustomType2() - { - return _customType2; - } - - public int getMana() - { - return _mana; - } - - public byte getAttackElementType() - { - return _elemAtkType; - } - - public int getAttackElementPower() - { - return _elemAtkPower; - } - - public int getElementDefAttr(byte i) - { - return _elemDefAttr[i]; - } - - public int[] getEnchantOptions() - { - return _enchantOptions; - } - - public Collection getSoulCrystalOptions() - { - return _soulCrystalOptions; - } - - public Collection getSoulCrystalSpecialOptions() - { - return _soulCrystalSpecialOptions; - } - - public int getTime() - { - return _time; - } - - /** - * @return the name of the item - */ - @Override - public String toString() - { - return _item.toString(); - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Weapon.java deleted file mode 100644 index 832169f5f1..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is dedicated to the management of weapons. - */ -public class Weapon extends ItemTemplate -{ - private WeaponType _type; - private boolean _isMagicWeapon; - private int _soulShotCount; - private int _spiritShotCount; - private int _mpConsume; - private int _baseAttackRange; - private int _baseAttackRadius; - private int _baseAttackAngle; - private int _changeWeaponId; - - private int _reducedSoulshot; - private int _reducedSoulshotChance; - - private int _reducedMpConsume; - private int _reducedMpConsumeChance; - - private boolean _isForceEquip; - private boolean _isAttackWeapon; - private boolean _useWeaponSkillsOnly; - - /** - * Constructor for Weapon. - * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. - */ - public Weapon(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_WEAPON; - _isMagicWeapon = set.getBoolean("is_magic_weapon", false); - _soulShotCount = set.getInt("soulshots", 0); - _spiritShotCount = set.getInt("spiritshots", 0); - _mpConsume = set.getInt("mp_consume", 0); - _baseAttackRange = set.getInt("attack_range", 40); - final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) - { - _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); - } - else - { - _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 - } - - final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); - _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; - _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; - - final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); - _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; - _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; - _changeWeaponId = set.getInt("change_weaponId", 0); - _isForceEquip = set.getBoolean("isForceEquip", false); - _isAttackWeapon = set.getBoolean("isAttackWeapon", true); - _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); - } - - /** - * @return the type of Weapon - */ - @Override - public WeaponType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - @Override - public boolean isWeapon() - { - return true; - } - - /** - * @return {@code true} if the weapon is magic, {@code false} otherwise. - */ - @Override - public boolean isMagicWeapon() - { - return _isMagicWeapon; - } - - /** - * @return the quantity of SoulShot used. - */ - public int getSoulShotCount() - { - return _soulShotCount; - } - - /** - * @return the quantity of SpiritShot used. - */ - public int getSpiritShotCount() - { - return _spiritShotCount; - } - - /** - * @return the reduced quantity of SoultShot used. - */ - public int getReducedSoulShot() - { - return _reducedSoulshot; - } - - /** - * @return the chance to use Reduced SoultShot. - */ - public int getReducedSoulShotChance() - { - return _reducedSoulshotChance; - } - - /** - * @return the MP consumption with the weapon. - */ - public int getMpConsume() - { - return _mpConsume; - } - - public int getBaseAttackRange() - { - return _baseAttackRange; - } - - public int getBaseAttackRadius() - { - return _baseAttackRadius; - } - - public int getBaseAttackAngle() - { - return _baseAttackAngle; - } - - /** - * @return the reduced MP consumption with the weapon. - */ - public int getReducedMpConsume() - { - return _reducedMpConsume; - } - - /** - * @return the chance to use getReducedMpConsume() - */ - public int getReducedMpConsumeChance() - { - return _reducedMpConsumeChance; - } - - /** - * @return the Id in which weapon this weapon can be changed. - */ - public int getChangeWeaponId() - { - return _changeWeaponId; - } - - /** - * @return {@code true} if the weapon is force equip, {@code false} otherwise. - */ - public boolean isForceEquip() - { - return _isForceEquip; - } - - /** - * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. - */ - public boolean isAttackWeapon() - { - return _isAttackWeapon; - } - - /** - * @return {@code true} if the weapon is skills only, {@code false} otherwise. - */ - public boolean useWeaponSkillsOnly() - { - return _useWeaponSkillsOnly; - } - - /** - * @param caster the Creature pointing out the caster - * @param target the Creature pointing out the target - * @param trigger - * @param type - */ - public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) - { - forEachSkill(type, holder -> - { - final Skill skill = holder.getSkill(); - if (Rnd.get(100) >= holder.getChance()) - { - return; - } - - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // Trigger only if both are good or bad magic. - if (trigger.isBad() != skill.isBad()) - { - return; - } - - // No Trigger if not Magic Skill or is toggle - if (trigger.isMagic() != skill.isMagic()) - { - return; - } - - // No Trigger if skill is toggle - if (trigger.isToggle()) - { - return; - } - - if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) - { - return; - } - } - - // Skill condition not met - if (!skill.checkCondition(caster, target, true)) - { - return; - } - - skill.activateSkill(caster, target); - - // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // notify quests of a skill use - if (caster.isPlayer()) - { - World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); - } - if (caster.isPlayer()) - { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); - sm.addSkillName(skill); - caster.sendPacket(sm); - } - } - }); - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java deleted file mode 100644 index a568389489..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ /dev/null @@ -1,558 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author UnAfraid - */ -public class AppearanceStone -{ - private final int _id; - private final int _cost; - private final int _visualId; - private final long _lifeTime; - private final AppearanceType _type; - private final WeaponType _weaponType; - private final ArmorType _armorType; - private final AppearanceHandType _handType; - private final AppearanceMagicType _magicType; - private List _crystalTypes; - private List _targetTypes; - private List _bodyParts; - private List _races; - private List _racesNot; - private List _allVisualIds; - - public AppearanceStone(StatSet set) - { - _id = set.getInt("id"); - _visualId = set.getInt("visualId", 0); - _cost = set.getInt("cost", 0); - _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); - _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); - _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); - _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); - _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); - _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); - - final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); - if (targetType != AppearanceTargetType.NONE) - { - addTargetType(targetType); - } - - // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. - final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); - - // If no crystal type is defined, we must add all defaults. - if (crystalType == null) - { - switch (targetType) - { - case ACCESSORY: - case ALL: - { - addCrystalType(CrystalType.NONE); - // fallthrough - } - case WEAPON: - case ARMOR: - { - for (CrystalType cryType : CrystalType.values()) - { - if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) - { - addCrystalType(cryType); - } - } - } - } - } - else - { - addCrystalType(crystalType); - } - - final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); - if (bodyPart != ItemTemplate.SLOT_NONE) - { - addBodyPart(bodyPart); - } - - final Race race = set.getEnum("race", Race.class, Race.NONE); - if (race != Race.NONE) - { - addRace(race); - } - - final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); - if (raceNot != Race.NONE) - { - addRaceNot(raceNot); - } - } - - public int getId() - { - return _id; - } - - public int getVisualId() - { - return _visualId; - } - - public int getCost() - { - return _cost; - } - - public long getLifeTime() - { - return _lifeTime; - } - - public AppearanceType getType() - { - return _type; - } - - public WeaponType getWeaponType() - { - return _weaponType; - } - - public ArmorType getArmorType() - { - return _armorType; - } - - public AppearanceHandType getHandType() - { - return _handType; - } - - public AppearanceMagicType getMagicType() - { - return _magicType; - } - - public void addCrystalType(CrystalType type) - { - if (_crystalTypes == null) - { - _crystalTypes = new ArrayList<>(); - } - _crystalTypes.add(type); - } - - public List getCrystalTypes() - { - return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); - } - - public void addTargetType(AppearanceTargetType type) - { - if (_targetTypes == null) - { - _targetTypes = new ArrayList<>(); - } - _targetTypes.add(type); - } - - public List getTargetTypes() - { - return _targetTypes != null ? _targetTypes : Collections.emptyList(); - } - - public void addBodyPart(long part) - { - if (_bodyParts == null) - { - _bodyParts = new ArrayList<>(); - } - _bodyParts.add(part); - } - - public void addVisualId(AppearanceHolder appearanceHolder) - { - if (_allVisualIds == null) - { - _allVisualIds = new ArrayList<>(); - } - _allVisualIds.add(appearanceHolder); - } - - public List getVisualIds() - { - return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); - } - - public List getBodyParts() - { - return _bodyParts != null ? _bodyParts : Collections.emptyList(); - } - - public void addRace(Race race) - { - if (_races == null) - { - _races = new ArrayList<>(); - } - _races.add(race); - } - - public List getRaces() - { - return _races != null ? _races : Collections.emptyList(); - } - - public void addRaceNot(Race race) - { - if (_racesNot == null) - { - _racesNot = new ArrayList<>(); - } - _racesNot.add(race); - } - - public List getRacesNot() - { - return _racesNot != null ? _racesNot : Collections.emptyList(); - } - - /** - * @param player the actor requesting to use this appearance. - * @param targetItem the item to be modified with this appearance. - * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. - */ - public boolean checkConditions(Player player, Item targetItem) - { - if (targetItem == null) - { - return false; - } - - if (getTargetTypes().isEmpty()) - { - return false; - } - - if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); - return false; - } - - switch (_type) - { - case RESTORE: - { - if (targetItem.getVisualId() == 0) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); - return false; - } - - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - default: - { - // Seems like in retail item with already changed appearance, can be changed again without being restored. - - final AppearanceTargetType targetType = getTargetTypes().get(0); - switch (targetType) - { - case NONE: - { - return false; - } - case WEAPON: - { - if (!targetItem.isWeapon()) - { - player.sendPacket(SystemMessageId.WEAPONS_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ARMOR: - { - if (!targetItem.isArmor()) - { - player.sendPacket(SystemMessageId.ARMOR_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ACCESSORY: - { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) - { - player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); - return false; - } - break; - } - case ALL: - { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (findVisualChange(targetItem) == null) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - return true; - } - } - break; - } - } - - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (_weaponType != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) - { - if (_weaponType != WeaponType.CROSSBOW) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - } - - switch (_handType) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - } - - switch (_magicType) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - if (_armorType != ArmorType.NONE) - { - switch (_armorType) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - return true; - } - - public AppearanceHolder findVisualChange(Item targetItem) - { - for (AppearanceHolder holder : _allVisualIds) - { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) - { - continue; - } - - if (holder.getWeaponType() != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) - { - if (holder.getWeaponType() != WeaponType.CROSSBOW) - { - continue; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - continue; - } - } - - switch (holder.getHandType()) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - continue; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - continue; - } - break; - } - } - - switch (holder.getMagicType()) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - continue; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - continue; - } - } - } - } - - if (holder.getArmorType() != ArmorType.NONE) - { - switch (holder.getArmorType()) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - continue; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - continue; - } - } - } - } - return holder; - } - return null; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java deleted file mode 100644 index a2897ba911..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import java.util.EnumMap; -import java.util.Map; - -import org.l2jmobius.gameserver.model.StatSet; - -/** - * @author UnAfraid - */ -public class CombinationItem -{ - private final int _itemOne; - private final int _itemTwo; - private final int _chance; - private final Map _rewards = new EnumMap<>(CombinationItemType.class); - - public CombinationItem(StatSet set) - { - _itemOne = set.getInt("one"); - _itemTwo = set.getInt("two"); - _chance = set.getInt("chance"); - } - - public int getItemOne() - { - return _itemOne; - } - - public int getItemTwo() - { - return _itemTwo; - } - - public int getChance() - { - return _chance; - } - - public void addReward(CombinationItemReward item) - { - _rewards.put(item.getType(), item); - } - - public CombinationItemReward getReward(CombinationItemType type) - { - return _rewards.get(type); - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java deleted file mode 100644 index a09b01d571..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.logging.Logger; - -import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public abstract class AbstractEnchantItem -{ - protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); - - private static final ItemType[] ENCHANT_TYPES = new ItemType[] - { - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - EtcItemType.BLESS_ENCHT_AM, - EtcItemType.BLESS_ENCHT_AM_DOWN, - EtcItemType.BLESS_ENCHT_WP, - EtcItemType.ENCHT_AM, - EtcItemType.ENCHT_WP, - EtcItemType.GIANT_ENCHT_AM, - EtcItemType.GIANT_ENCHT_WP, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - }; - - private final int _id; - private final CrystalType _grade; - private final int _minEnchantLevel; - private final int _maxEnchantLevel; - private final int _safeEnchantLevel; - private final int _randomEnchantMin; - private final int _randomEnchantMax; - private final double _bonusRate; - - public AbstractEnchantItem(StatSet set) - { - _id = set.getInt("id"); - if (getItem() == null) - { - throw new NullPointerException(); - } - else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) - { - throw new IllegalAccessError(); - } - _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); - _minEnchantLevel = set.getInt("minEnchant", 0); - _maxEnchantLevel = set.getInt("maxEnchant", 127); - _safeEnchantLevel = set.getInt("safeEnchant", 0); - _randomEnchantMin = set.getInt("randomEnchantMin", 1); - _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); - _bonusRate = set.getDouble("bonusRate", 0); - } - - /** - * @return id of current item - */ - public int getId() - { - return _id; - } - - /** - * @return bonus chance that would be added - */ - public double getBonusRate() - { - return _bonusRate; - } - - /** - * @return {@link ItemTemplate} current item/scroll - */ - public ItemTemplate getItem() - { - return ItemTable.getInstance().getTemplate(_id); - } - - /** - * @return grade of the item/scroll. - */ - public CrystalType getGrade() - { - return _grade; - } - - /** - * @return {@code true} if scroll is for weapon, {@code false} for armor - */ - public abstract boolean isWeapon(); - - /** - * @return the minimum enchant level that this scroll/item can be used with - */ - public int getMinEnchantLevel() - { - return _minEnchantLevel; - } - - /** - * @return the maximum enchant level that this scroll/item can be used with - */ - public int getMaxEnchantLevel() - { - return _maxEnchantLevel; - } - - /** - * @return the safe enchant level of this scroll/item - */ - public int getSafeEnchant() - { - return _safeEnchantLevel; - } - - /** - * @return the minimum random enchant level of this scroll/item - */ - public int getRandomEnchantMin() - { - return _randomEnchantMin; - } - - /** - * @return the maximum random enchant level of this scroll/item - */ - public int getRandomEnchantMax() - { - return _randomEnchantMax; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem - * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise - */ - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if (itemToEnchant == null) - { - return false; - } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) - { - return false; - } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) - { - return false; - } - else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) - { - return false; - } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) - { - return false; - } - return true; - } - - /** - * @param type2 - * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise - */ - private boolean isValidItemType(int type2) - { - if (type2 == ItemTemplate.TYPE2_WEAPON) - { - return isWeapon(); - } - else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) - { - return !isWeapon(); - } - return false; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fe698d8e2a..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private long _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(long slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java deleted file mode 100644 index e2c2f6ad68..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ /dev/null @@ -1,229 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.HashSet; -import java.util.Set; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.data.xml.EnchantItemData; -import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author UnAfraid - */ -public class EnchantScroll extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isBlessedDown; - private final boolean _isSafe; - private final boolean _isGiant; - private final int _scrollGroupId; - private Set _items; - - public EnchantScroll(StatSet set) - { - super(set); - _scrollGroupId = set.getInt("scrollGroupId", 0); - - final ItemType type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN); - _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - /** - * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will reset to 0), {@code false} otherwise - */ - public boolean isBlessed() - { - return _isBlessed; - } - - /** - * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise - */ - public boolean isBlessedDown() - { - return _isBlessedDown; - } - - /** - * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise - */ - public boolean isSafe() - { - return _isSafe; - } - - public boolean isGiant() - { - return _isGiant; - } - - /** - * @return id of scroll group that should be used - */ - public int getScrollGroupId() - { - return _scrollGroupId; - } - - /** - * Enforces current scroll to use only those items as possible items to enchant - * @param itemId - */ - public void addItem(int itemId) - { - if (_items == null) - { - _items = new HashSet<>(); - } - _items.add(itemId); - } - - public Set getItems() - { - return _items; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem the support item used when enchanting (can be null) - * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise - */ - @Override - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if ((_items != null) && !_items.contains(itemToEnchant.getId())) - { - return false; - } - else if ((supportItem != null)) - { - if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed())) - { - return false; - } - else if ((isBlessedDown() && !supportItem.isBlessed()) || (!isBlessedDown() && supportItem.isBlessed())) - { - return false; - } - else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant())) - { - return false; - } - else if (!supportItem.isValid(itemToEnchant, supportItem)) - { - return false; - } - else if (supportItem.isWeapon() != isWeapon()) - { - return false; - } - } - if (_items == null) - { - for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls()) - { - if (scroll.getId() == getId()) - { - continue; - } - final Set scrollItems = scroll.getItems(); - if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId())) - { - return false; - } - } - } - return super.isValid(itemToEnchant, supportItem); - } - - /** - * @param player - * @param enchantItem - * @return the chance of current scroll's group. - */ - public double getChance(Player player, Item enchantItem) - { - if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); - return -1; - } - - final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); - if (group == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); - return -1; - } - - if ((getSafeEnchant() > 0) && (enchantItem.getEnchantLevel() < getSafeEnchant())) - { - return 100; - } - - return group.getChance(enchantItem.getEnchantLevel()); - } - - /** - * @param player - * @param enchantItem - * @param supportItem - * @return the total chance for success rate of this scroll - */ - public EnchantResultType calculateSuccess(Player player, Item enchantItem, EnchantSupportItem supportItem) - { - if (!isValid(enchantItem, supportItem)) - { - return EnchantResultType.ERROR; - } - - final double chance = getChance(player, enchantItem); - if (chance == -1) - { - return EnchantResultType.ERROR; - } - - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); - final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; - final double bonusRate = getBonusRate(); - final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; - final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100); - final double random = 100 * Rnd.nextDouble(); - final boolean success = (random < finalChance); - return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java deleted file mode 100644 index 13d6b5a2ee..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public class EnchantSupportItem extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isGiant; - private final ItemType type; - - public EnchantSupportItem(StatSet set) - { - super(set); - type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - public boolean isBlessed() - { - return _isBlessed; - } - - public boolean isGiant() - { - return _isGiant; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java deleted file mode 100644 index d059efd025..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Crystal Type enumerated. - * @author Adry_85 - */ -public enum CrystalType -{ - NONE(0, 0, 0, 0), - D(1, 1458, 11, 90), - C(2, 1459, 6, 45), - B(3, 1460, 11, 67), - A(4, 1461, 20, 145), - S(5, 1462, 25, 250), - S80(6, 1462, 25, 250), - S84(7, 1462, 25, 250), - R(8, 17371, 30, 500), - R95(9, 17371, 30, 500), - R99(10, 17371, 30, 500), - EVENT(11, 0, 0, 0); - - private final int _level; - private final int _crystalId; - private final int _crystalEnchantBonusArmor; - private final int _crystalEnchantBonusWeapon; - - CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) - { - _level = level; - _crystalId = crystalId; - _crystalEnchantBonusArmor = crystalEnchantBonusArmor; - _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; - } - - /** - * Gets the crystal type ID. - * @return the crystal type ID - */ - public int getLevel() - { - return _level; - } - - /** - * Gets the item ID of the crystal. - * @return the item ID of the crystal - */ - public int getCrystalId() - { - return _crystalId; - } - - public int getCrystalEnchantBonusArmor() - { - return _crystalEnchantBonusArmor; - } - - public int getCrystalEnchantBonusWeapon() - { - return _crystalEnchantBonusWeapon; - } - - public boolean isGreater(CrystalType crystalType) - { - return getLevel() > crystalType.getLevel(); - } - - public boolean isLesser(CrystalType crystalType) - { - return getLevel() < crystalType.getLevel(); - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java deleted file mode 100644 index b352bd7fc0..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * EtcItem Type enumerated. - */ -public enum EtcItemType implements ItemType -{ - NONE, - SCROLL, - ARROW, - POTION, - SPELLBOOK, - RECIPE, - MATERIAL, - PET_COLLAR, - CASTLE_GUARD, - DYE, - SEED, - SEED2, - HARVEST, - LOTTO, - RACE_TICKET, - TICKET_OF_LORD, - LURE, - CROP, - MATURECROP, - ENCHT_WP, - ENCHT_AM, - GIANT_ENCHT_WP, - GIANT_ENCHT_AM, - BLESS_ENCHT_WP, - BLESS_ENCHT_AM, - BLESS_ENCHT_AM_DOWN, - COUPON, - ELIXIR, - ENCHT_ATTR, - ENCHT_ATTR_CURSED, - BOLT, - ENCHT_ATTR_INC_PROP_ENCHT_WP, - ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_RUNE, - ENCHT_ATTRT_RUNE_SELECT, - TELEPORTBOOKMARK, - CHANGE_ATTR, - SOULSHOT, - SHAPE_SHIFTING_WP, - BLESS_SHAPE_SHIFTING_WP, - // EIT_RESTORE_SHAPE_SHIFTING_WP, - SHAPE_SHIFTING_WP_FIXED, - SHAPE_SHIFTING_AM, - BLESS_SHAPE_SHIFTING_AM, - SHAPE_SHIFTING_AM_FIXED, - SHAPE_SHIFTING_HAIRACC, - BLESS_SHAPE_SHIFTING_HAIRACC, - SHAPE_SHIFTING_HAIRACC_FIXED, - RESTORE_SHAPE_SHIFTING_WP, - RESTORE_SHAPE_SHIFTING_AM, - RESTORE_SHAPE_SHIFTING_HAIRACC, - RESTORE_SHAPE_SHIFTING_ALLITEM, - BLESS_INC_PROP_ENCHT_WP, - BLESS_INC_PROP_ENCHT_AM, - CARD_EVENT, - SHAPE_SHIFTING_ALLITEM_FIXED, - MULTI_ENCHT_WP, - MULTI_ENCHT_AM, - MULTI_INC_PROB_ENCHT_WP, - MULTI_INC_PROB_ENCHT_AM, - SOUL_CRYSTAL, - ENSOUL_STONE; - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return 0; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c807e1298e..0fcb8c33e4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 17c83523b7..44a87d7c08 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java index 7d30237cb1..d9c41811d2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java index 4f8839c353..d777746032 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 1e50e349a6..edd819d4c7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -58,10 +58,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 54907880aa..63f20c77b2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -39,11 +39,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index ec7537f935..4c7fa317a0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 577ca267e7..65b445397e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index f4bf542a6d..05d0c728ec 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 38a7116383..ff0ad75b8a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index c1cac0d20a..02c4f00cf6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 1839afb5ce..334fb9252a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 7109a54ed1..5df6b208a3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index 165f9b4668..80e30184ff 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index df3acc3df1..7c51b0ad38 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index bab0af38a8..1c31ff4a11 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index cfb6455ad0..31d29ef3dd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index f467c9e4c3..e25524223a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6d89336175..c108cbb762 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -52,8 +52,8 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index dc02d363c8..ea86074f0e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 7c2ffd3381..04cf0eb4aa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 8e4db9d92c..a7e3f28ed6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 0d59d2ff65..e8d7efa6b0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 9054640b60..2f12cc278e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 2ca0f283f9..4f351a636b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 6cc03e2c2b..48cdb8e80b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index db5ba0efb5..84ae58c9f8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 21dcd2d13d..9565b3e5ca 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 6b1a6a94e8..1b20e2e248 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 29f7828f27..a9fd8d923a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 12bc7c708d..79e1193ac0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index ce98ab493d..d0add3fa49 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 595da81538..ab9f0c33f7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 945ff531e4..b9c3900403 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 1ee323a63c..7da966ce9f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 989d2e582f..2c715b4efb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d7fcffbdb5..4468b67642 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index ce66388a02..ecb0ab9738 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index de4094b252..db5981de3d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 60cfa6b927..6d1eea218a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 61920f471b..f89be1cfcb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index ff361e97a4..1840fcded7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 17fa6aeaf2..f02aaa9ace 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 3ec19e6e89..1e392c2ff7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,10 +37,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 81e3a8f4c9..7e89bd6ed3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java index 1fc0400b59..eafc924a43 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.ActionDataHolder; import org.l2jmobius.gameserver.model.ShortCuts; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index e7a8e8baf6..7fbd7ebecb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 56cf3b84cc..b9a7aadbf7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 59c63fceca..acee799091 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 25c9792ec1..3220827fbb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index a4f0ecaefb..d5690408da 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51cd76618e..af8b12547e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 38bda2e6fb..e9cd6a88b8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 61fd93e55c..6063a54535 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index 5a7a9c9c3b..a0ba15da9f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.holders.DamageTakenHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 12359bcd17..2cea176d69 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 93588924fe..077f33cb49 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 07725028a6..76375a86f7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c9e5eabc7..ef1d37297e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index e4fb9e4160..b65005003d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 51abfa9d3e..f49138fafe 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 4bd0a38bda..7e0614b359 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 6d0df16c27..0e6e64c7b2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 61a01d067c..658087380a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 84bc5a6eba..3800940bac 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index b79342c0a8..3a780986a0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index bd768c74e2..c4598a72e6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index a5616075a6..e1da19cc8f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ced39204d3..fbb5c84dfe 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4068629bde..d05590cbde 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 0e6211e63b..358ee2361b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 0dc656cef6..2d352ea5cd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c742d534c4..c59568bf1d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index a22b36335e..35ca986d35 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 271ec4401b..37150ec357 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 6b8cd1358f..c32d4f7c04 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java index 3c87faec44..f61481565a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.vip; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index 70821d206d..f6e9eb89d0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro; /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 7553a3233e..fb0db44e8e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Guard; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/DocumentBase.java index cebed94cd2..a2f01e4fae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -47,6 +47,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -135,9 +138,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 97650c7ab7..d17d6cd450 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/SiegeGuards.java index 8ac4fe72af..c9ca7df743 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index fa45b28c67..42d382f269 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index dd4215411e..a8e6c06eed 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 9a1bfbc322..4afd6e9f3c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 1ff3d6ae84..ee5c5e5649 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index a1dac8e67f..4a0debf3a8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Loto.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Loto.java index f09aabdcbc..caa9e55066 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Loto.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/Loto.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.instancemanager.games.Lottery; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 0a82f9968d..35d31315ad 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 0fa7101eb1..647d14cec5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index c302e3c7db..7d09d9db55 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AirBind.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index dd5c2f593d..2ea2bf9f11 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 4e5a8d7aaf..1950403a0d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index d5d2ad10cf..8f4db5d580 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 24d5d75b7a..704f15e5ba 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index a403724d9a..10d1c9e03b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 2b6db19588..607dc3b8f5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 7d0f0b43ba..9723633d69 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 4fdcb5ca9a..a4f5e2fc18 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index c6430fd345..8eaf69885f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index c099f83cdc..2b4e805618 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 03d4c3e0ab..de0fbf4f46 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 93e02fc767..6d2b5eda97 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 17265c71d0..083ca3f26c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 705ed225aa..a74d84251f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index ebbd33bda0..f952b58fa2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 189a2f7e73..714a195ccb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 043cb60eda..848205eff4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index c48c8c4f89..69f300061e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 7e76e6cb94..1930801379 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 7d2f4894c6..770b66ee92 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 02468039cf..742f98e38b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index cb5ee16345..fbb64bace5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 742ca00283..3d97c9ac22 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 3eb4d77710..8b4d315b50 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index d0e6895317..16fd85e49d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index a88c6c50c5..0aa5cb3e1f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index 7b85863864..d8651111d0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index 7557fd8c48..ad6331a128 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index bff2074879..cf16c08177 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 8e083453c6..35f8fdfc3f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 6e740c795b..309be347bd 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 6eafe458ae..35770ca964 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b4ea6e761f..bfc5324c4d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index 93ec11da2c..0f60a7ef2e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 410e71cff8..01714d7f5a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 41b1cd8f36..afa0f47062 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index ecb73b365e..30e5fd51af 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 80351144d6..44599b2555 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 2472a2d955..85d614b478 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index d1d5c8c332..c2610ec4e3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index a5204bbd9d..ca436cb079 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; public class Elixir extends ItemSkills diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index f34121bb2d..46c5c6db93 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 3ae04b22f4..c32e1327ea 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 97b69f1ade..18db46d59f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index a02dc34079..8167aa1eef 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 02629d5d34..e17c4d3c90 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 8ae2110eba..295b3fce2b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27f0904f0f..a61cc1bd71 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 255f805e72..12f575b243 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index 3988e77104..587f809dc9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 0ff861388c..75ab0bae7e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java index 4e5984b292..efde71ba49 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java index e70725593d..954c6b4142 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00229_TestOfWitchcraft/Q00229_TestOfWitchcraft.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java index a3a6734f90..13e468df91 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLogin; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerPressTutorialMark; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.QuestSoundHtmlHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index df4b93a740..39e9af0f20 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java index d29aaf54b5..7773083c9a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java index cb732dea8c..bd13a4bbe9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java index 00920614ce..0d21264633 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.SocialAction; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java index 18cd9e10e3..f9526a32db 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java index 8cdc3feccb..026a9cb6a8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java @@ -65,7 +65,7 @@ import org.l2jmobius.gameserver.enums.GeoType; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.util.FloodProtectorConfig; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 6b7415e226..b4ae35107a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java index bb78cafa1c..670e0a7192 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index bcf4a3a3c3..463ba0e6b9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java index 9197c33197..914259543f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index b125f0373b..438c07f6b9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index 8188d90cc5..3bfdfb138c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 99e8b8b3d2..1c3099e6c4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index 7d5650e2b7..7c967dd1a2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,8 +36,8 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 5ee48353df..ed22b22e6b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,9 +44,9 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/NpcData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/NpcData.java index be3524495d..a668cfdaad 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/NpcData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/NpcData.java @@ -47,8 +47,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.DropHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/RecipeData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/RecipeData.java index 57bce7ed76..bca07aaf0a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/RecipeData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/RecipeData.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * The Class RecipeData. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 07af46b4a4..339a7e047c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/VariationData.java index a27d0acebb..c0c06be95c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index d2337f0f98..df1c988200 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 0f7be781b2..7bc7be8487 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index ba3ab89b07..20d23bc7fc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 85c1538ea4..3e02ce19ab 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -35,9 +35,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index 3d21c7ddf0..5f3eb28e8a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java index 362bef0c0f..a579be6a5f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ArmorSet.java index 4d11cf0970..a84709e2db 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java index dc49fce1cc..7385a9fc13 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java index f34fda05ad..806375ccc4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java index e698197219..be9f4aed00 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -21,9 +21,9 @@ import java.util.Objects; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java index ec67ca4a4a..5244307c22 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java @@ -45,8 +45,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java index a9796fbbb7..36f3461010 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TradeItem.java index 611343da6b..ffaddf73a1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model; import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java index ba25090b4c..27c50e5787 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 69331b58e7..4c26e45737 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -65,8 +65,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index b032bddfdb..b88d1fbde8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -115,12 +115,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java index c7281cf086..f43632c2fd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -74,8 +74,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index 7ce48879ea..b0ae9aaf5a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -224,6 +224,16 @@ import org.l2jmobius.gameserver.model.holders.SubClassHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; @@ -231,16 +241,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java index 738d1de7f1..7210a7fbcb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -44,11 +44,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index b93149d928..0423214997 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -59,11 +59,11 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index c4ddf661eb..d7b5dfc6a5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index fec2d214b7..6e78398f31 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index b621ac99a1..b2b77ee360 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index 99060558ba..4552b070ca 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 624c0121ea..a4cd7011cc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 29208b2b65..8e5328b099 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e45460a947..d92fecf5bd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9f908898ea..ebdbe02899 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index d60e1343b9..1f55ed1bae 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 2e75866e00..0b472089a8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index fcd8e14da5..2613a1847b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java index bab8b12ab1..9f4fdbdfc9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerGrade.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index 5441557b76..d1aef6c0ce 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index c8a999a165..d1a5834e49 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index 952f083c90..3f89277658 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index dc2add2a3a..8c8b2b019d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -130,15 +130,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index 92bce4268b..14cccac24d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 16644245de..c792f858bb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index 574e07a8e7..a6b878697e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Armor.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Armor.java new file mode 100644 index 0000000000..6d53c84197 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -0,0 +1,87 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.ArmorType; + +/** + * This class is dedicated to the management of armors. + */ +public class Armor extends ItemTemplate +{ + private ArmorType _type; + + /** + * Constructor for Armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. + */ + public Armor(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); + + final int bodyPart = getBodyPart(); + if ((bodyPart == ItemTemplate.SLOT_NECK) || ((bodyPart & ItemTemplate.SLOT_L_EAR) != 0) || ((bodyPart & ItemTemplate.SLOT_L_FINGER) != 0) || ((bodyPart & ItemTemplate.SLOT_R_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_L_BRACELET) != 0)) + { + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_ACCESSORY; + } + else + { + if ((_type == ArmorType.NONE) && (getBodyPart() == ItemTemplate.SLOT_L_HAND)) + { + _type = ArmorType.SHIELD; + } + _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; + _type2 = ItemTemplate.TYPE2_SHIELD_ARMOR; + } + } + + /** + * @return the type of the armor. + */ + @Override + public ArmorType getItemType() + { + return _type; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise + */ + @Override + public boolean isArmor() + { + return true; + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Henna.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Henna.java new file mode 100644 index 0000000000..d029309b0f --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -0,0 +1,171 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; + +/** + * Class for the Henna object. + * @author Zoey76 + */ +public class Henna +{ + private final int _dyeId; + private final int _dyeItemId; + private final Map _baseStats = new HashMap<>(); + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final int _duration; + private final List _skills; + private final List _wearClass; + + public Henna(StatSet set) + { + _dyeId = set.getInt("dyeId"); + _dyeItemId = set.getInt("dyeItemId"); + _baseStats.put(BaseStat.STR, set.getInt("str", 0)); + _baseStats.put(BaseStat.CON, set.getInt("con", 0)); + _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); + _baseStats.put(BaseStat.INT, set.getInt("int", 0)); + _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); + _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _duration = set.getInt("duration", -1); + _skills = new ArrayList<>(); + _wearClass = new ArrayList<>(); + } + + /** + * @return the dye Id. + */ + public int getDyeId() + { + return _dyeId; + } + + /** + * @return the item Id, required for this dye. + */ + public int getDyeItemId() + { + return _dyeItemId; + } + + public int getBaseStats(BaseStat stat) + { + return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); + } + + public Map getBaseStats() + { + return _baseStats; + } + + /** + * @return the wear fee, cost for adding this dye to the player. + */ + public int getWearFee() + { + return _wearFee; + } + + /** + * @return the wear count, the required count to add this dye to the player. + */ + public int getWearCount() + { + return _wearCount; + } + + /** + * @return the cancel fee, cost for removing this dye from the player. + */ + public int getCancelFee() + { + return _cancelFee; + } + + /** + * @return the cancel count, the retrieved amount of dye items after removing the dye. + */ + public int getCancelCount() + { + return _cancelCount; + } + + /** + * @return the duration of this dye. + */ + public int getDuration() + { + return _duration; + } + + /** + * @param skillList the list of skills related to this dye. + */ + public void setSkills(List skillList) + { + _skills.addAll(skillList); + } + + /** + * @return the skills related to this dye. + */ + public List getSkills() + { + return _skills; + } + + /** + * @return the list with the allowed classes to wear this dye. + */ + public List getAllowedWearClass() + { + return _wearClass; + } + + /** + * @param classId the class trying to wear this dye. + * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. + */ + public boolean isAllowedClass(ClassId classId) + { + return _wearClass.contains(classId); + } + + /** + * @param wearClassIds the list of classes that can wear this dye. + */ + public void setWearClassIds(List wearClassIds) + { + _wearClass.addAll(wearClassIds); + } +} \ No newline at end of file diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index d92bf00f39..8aabc7b9aa 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 90% rename from L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index cd3447256e..f3f56d7985 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java new file mode 100644 index 0000000000..3ae599da0d --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -0,0 +1,311 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.enums.ItemSkillType; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is dedicated to the management of weapons. + */ +public class Weapon extends ItemTemplate +{ + private WeaponType _type; + private boolean _isMagicWeapon; + private int _soulShotCount; + private int _spiritShotCount; + private int _mpConsume; + private int _baseAttackRange; + private int _baseAttackRadius; + private int _baseAttackAngle; + private int _changeWeaponId; + + private int _reducedSoulshot; + private int _reducedSoulshotChance; + + private int _reducedMpConsume; + private int _reducedMpConsumeChance; + + private boolean _isForceEquip; + private boolean _isAttackWeapon; + private boolean _useWeaponSkillsOnly; + + /** + * Constructor for Weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. + */ + public Weapon(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_WEAPON; + _isMagicWeapon = set.getBoolean("is_magic_weapon", false); + _soulShotCount = set.getInt("soulshots", 0); + _spiritShotCount = set.getInt("spiritshots", 0); + _mpConsume = set.getInt("mp_consume", 0); + _baseAttackRange = set.getInt("attack_range", 40); + final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) + { + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + } + else + { + _baseAttackRadius = 40; + _baseAttackAngle = 240; // 360 - 120 + } + + final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); + _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; + _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; + + final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); + _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; + _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; + _changeWeaponId = set.getInt("change_weaponId", 0); + _isForceEquip = set.getBoolean("isForceEquip", false); + _isAttackWeapon = set.getBoolean("isAttackWeapon", true); + _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); + } + + /** + * @return the type of Weapon + */ + @Override + public WeaponType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + @Override + public boolean isWeapon() + { + return true; + } + + /** + * @return {@code true} if the weapon is magic, {@code false} otherwise. + */ + @Override + public boolean isMagicWeapon() + { + return _isMagicWeapon; + } + + /** + * @return the quantity of SoulShot used. + */ + public int getSoulShotCount() + { + return _soulShotCount; + } + + /** + * @return the quantity of SpiritShot used. + */ + public int getSpiritShotCount() + { + return _spiritShotCount; + } + + /** + * @return the reduced quantity of SoultShot used. + */ + public int getReducedSoulShot() + { + return _reducedSoulshot; + } + + /** + * @return the chance to use Reduced SoultShot. + */ + public int getReducedSoulShotChance() + { + return _reducedSoulshotChance; + } + + /** + * @return the MP consumption with the weapon. + */ + public int getMpConsume() + { + return _mpConsume; + } + + public int getBaseAttackRange() + { + return _baseAttackRange; + } + + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + + /** + * @return the reduced MP consumption with the weapon. + */ + public int getReducedMpConsume() + { + return _reducedMpConsume; + } + + /** + * @return the chance to use getReducedMpConsume() + */ + public int getReducedMpConsumeChance() + { + return _reducedMpConsumeChance; + } + + /** + * @return the Id in which weapon this weapon can be changed. + */ + public int getChangeWeaponId() + { + return _changeWeaponId; + } + + /** + * @return {@code true} if the weapon is force equip, {@code false} otherwise. + */ + public boolean isForceEquip() + { + return _isForceEquip; + } + + /** + * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. + */ + public boolean isAttackWeapon() + { + return _isAttackWeapon; + } + + /** + * @return {@code true} if the weapon is skills only, {@code false} otherwise. + */ + public boolean useWeaponSkillsOnly() + { + return _useWeaponSkillsOnly; + } + + /** + * @param caster the Creature pointing out the caster + * @param target the Creature pointing out the target + * @param trigger + * @param type + */ + public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) + { + forEachSkill(type, holder -> + { + final Skill skill = holder.getSkill(); + if (Rnd.get(100) >= holder.getChance()) + { + return; + } + + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // Trigger only if both are good or bad magic. + if (trigger.isBad() != skill.isBad()) + { + return; + } + + // No Trigger if not Magic Skill or is toggle + if (trigger.isMagic() != skill.isMagic()) + { + return; + } + + // No Trigger if skill is toggle + if (trigger.isToggle()) + { + return; + } + + if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) + { + return; + } + } + + // Skill condition not met + if (!skill.checkCondition(caster, target)) + { + return; + } + + skill.activateSkill(caster, target); + + // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // notify quests of a skill use + if (caster.isPlayer()) + { + World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); + } + if (caster.isPlayer()) + { + final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); + sm.addSkillName(skill); + caster.sendPacket(sm); + } + } + }); + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java new file mode 100644 index 0000000000..4736db96a7 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -0,0 +1,558 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.network.SystemMessageId; + +/** + * @author UnAfraid + */ +public class AppearanceStone +{ + private final int _id; + private final int _cost; + private final int _visualId; + private final long _lifeTime; + private final AppearanceType _type; + private final WeaponType _weaponType; + private final ArmorType _armorType; + private final AppearanceHandType _handType; + private final AppearanceMagicType _magicType; + private List _crystalTypes; + private List _targetTypes; + private List _bodyParts; + private List _races; + private List _racesNot; + private List _allVisualIds; + + public AppearanceStone(StatSet set) + { + _id = set.getInt("id"); + _visualId = set.getInt("visualId", 0); + _cost = set.getInt("cost", 0); + _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); + _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); + _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); + _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); + _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); + _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); + + final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); + if (targetType != AppearanceTargetType.NONE) + { + addTargetType(targetType); + } + + // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. + final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); + + // If no crystal type is defined, we must add all defaults. + if (crystalType == null) + { + switch (targetType) + { + case ACCESSORY: + case ALL: + { + addCrystalType(CrystalType.NONE); + // fallthrough + } + case WEAPON: + case ARMOR: + { + for (CrystalType cryType : CrystalType.values()) + { + if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) + { + addCrystalType(cryType); + } + } + } + } + } + else + { + addCrystalType(crystalType); + } + + final int bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); + if (bodyPart != ItemTemplate.SLOT_NONE) + { + addBodyPart(bodyPart); + } + + final Race race = set.getEnum("race", Race.class, Race.NONE); + if (race != Race.NONE) + { + addRace(race); + } + + final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); + if (raceNot != Race.NONE) + { + addRaceNot(raceNot); + } + } + + public int getId() + { + return _id; + } + + public int getVisualId() + { + return _visualId; + } + + public int getCost() + { + return _cost; + } + + public long getLifeTime() + { + return _lifeTime; + } + + public AppearanceType getType() + { + return _type; + } + + public WeaponType getWeaponType() + { + return _weaponType; + } + + public ArmorType getArmorType() + { + return _armorType; + } + + public AppearanceHandType getHandType() + { + return _handType; + } + + public AppearanceMagicType getMagicType() + { + return _magicType; + } + + public void addCrystalType(CrystalType type) + { + if (_crystalTypes == null) + { + _crystalTypes = new ArrayList<>(); + } + _crystalTypes.add(type); + } + + public List getCrystalTypes() + { + return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); + } + + public void addTargetType(AppearanceTargetType type) + { + if (_targetTypes == null) + { + _targetTypes = new ArrayList<>(); + } + _targetTypes.add(type); + } + + public List getTargetTypes() + { + return _targetTypes != null ? _targetTypes : Collections.emptyList(); + } + + public void addBodyPart(Integer part) + { + if (_bodyParts == null) + { + _bodyParts = new ArrayList<>(); + } + _bodyParts.add(part); + } + + public void addVisualId(AppearanceHolder appearanceHolder) + { + if (_allVisualIds == null) + { + _allVisualIds = new ArrayList<>(); + } + _allVisualIds.add(appearanceHolder); + } + + public List getVisualIds() + { + return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); + } + + public List getBodyParts() + { + return _bodyParts != null ? _bodyParts : Collections.emptyList(); + } + + public void addRace(Race race) + { + if (_races == null) + { + _races = new ArrayList<>(); + } + _races.add(race); + } + + public List getRaces() + { + return _races != null ? _races : Collections.emptyList(); + } + + public void addRaceNot(Race race) + { + if (_racesNot == null) + { + _racesNot = new ArrayList<>(); + } + _racesNot.add(race); + } + + public List getRacesNot() + { + return _racesNot != null ? _racesNot : Collections.emptyList(); + } + + /** + * @param player the actor requesting to use this appearance. + * @param targetItem the item to be modified with this appearance. + * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. + */ + public boolean checkConditions(Player player, Item targetItem) + { + if (targetItem == null) + { + return false; + } + + if (getTargetTypes().isEmpty()) + { + return false; + } + + if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); + return false; + } + + switch (_type) + { + case RESTORE: + { + if (targetItem.getVisualId() == 0) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); + return false; + } + + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + default: + { + // Seems like in retail item with already changed appearance, can be changed again without being restored. + + final AppearanceTargetType targetType = getTargetTypes().get(0); + switch (targetType) + { + case NONE: + { + return false; + } + case WEAPON: + { + if (!targetItem.isWeapon()) + { + player.sendPacket(SystemMessageId.WEAPONS_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ARMOR: + { + if (!targetItem.isArmor()) + { + player.sendPacket(SystemMessageId.ARMOR_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ACCESSORY: + { + if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + { + player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); + return false; + } + break; + } + case ALL: + { + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (findVisualChange(targetItem) == null) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + return true; + } + } + break; + } + } + + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (_weaponType != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) + { + if (_weaponType != WeaponType.CROSSBOW) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + } + + switch (_handType) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + } + + switch (_magicType) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + if (_armorType != ArmorType.NONE) + { + switch (_armorType) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + return true; + } + + public AppearanceHolder findVisualChange(Item targetItem) + { + for (AppearanceHolder holder : _allVisualIds) + { + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + { + continue; + } + + if (holder.getWeaponType() != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) + { + if (holder.getWeaponType() != WeaponType.CROSSBOW) + { + continue; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + continue; + } + } + + switch (holder.getHandType()) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + continue; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + continue; + } + break; + } + } + + switch (holder.getMagicType()) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + continue; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + continue; + } + } + } + } + + if (holder.getArmorType() != ArmorType.NONE) + { + switch (holder.getArmorType()) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + continue; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + continue; + } + } + } + } + return holder; + } + return null; + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java new file mode 100644 index 0000000000..6f73983c0e --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -0,0 +1,65 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import java.util.EnumMap; +import java.util.Map; + +import org.l2jmobius.gameserver.model.StatSet; + +/** + * @author UnAfraid + */ +public class CombinationItem +{ + private final int _itemOne; + private final int _itemTwo; + private final int _chance; + private final Map _rewards = new EnumMap<>(CombinationItemType.class); + + public CombinationItem(StatSet set) + { + _itemOne = set.getInt("one"); + _itemTwo = set.getInt("two"); + _chance = set.getInt("chance"); + } + + public int getItemOne() + { + return _itemOne; + } + + public int getItemTwo() + { + return _itemTwo; + } + + public int getChance() + { + return _chance; + } + + public void addReward(CombinationItemReward item) + { + _rewards.put(item.getType(), item); + } + + public CombinationItemReward getReward(CombinationItemType type) + { + return _rewards.get(type); + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java new file mode 100644 index 0000000000..8890655085 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -0,0 +1,210 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.logging.Logger; + +import org.l2jmobius.commons.util.CommonUtil; +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public abstract class AbstractEnchantItem +{ + protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); + + private static final ItemType[] ENCHANT_TYPES = new ItemType[] + { + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + EtcItemType.BLESS_ENCHT_AM, + EtcItemType.BLESS_ENCHT_AM_DOWN, + EtcItemType.BLESS_ENCHT_WP, + EtcItemType.ENCHT_AM, + EtcItemType.ENCHT_WP, + EtcItemType.GIANT_ENCHT_AM, + EtcItemType.GIANT_ENCHT_WP, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + }; + + private final int _id; + private final CrystalType _grade; + private final int _minEnchantLevel; + private final int _maxEnchantLevel; + private final int _safeEnchantLevel; + private final int _randomEnchantMin; + private final int _randomEnchantMax; + private final double _bonusRate; + + public AbstractEnchantItem(StatSet set) + { + _id = set.getInt("id"); + if (getItem() == null) + { + throw new NullPointerException(); + } + else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) + { + throw new IllegalAccessError(); + } + _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); + _minEnchantLevel = set.getInt("minEnchant", 0); + _maxEnchantLevel = set.getInt("maxEnchant", 127); + _safeEnchantLevel = set.getInt("safeEnchant", 0); + _randomEnchantMin = set.getInt("randomEnchantMin", 1); + _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); + _bonusRate = set.getDouble("bonusRate", 0); + } + + /** + * @return id of current item + */ + public int getId() + { + return _id; + } + + /** + * @return bonus chance that would be added + */ + public double getBonusRate() + { + return _bonusRate; + } + + /** + * @return {@link ItemTemplate} current item/scroll + */ + public ItemTemplate getItem() + { + return ItemTable.getInstance().getTemplate(_id); + } + + /** + * @return grade of the item/scroll. + */ + public CrystalType getGrade() + { + return _grade; + } + + /** + * @return {@code true} if scroll is for weapon, {@code false} for armor + */ + public abstract boolean isWeapon(); + + /** + * @return the minimum enchant level that this scroll/item can be used with + */ + public int getMinEnchantLevel() + { + return _minEnchantLevel; + } + + /** + * @return the maximum enchant level that this scroll/item can be used with + */ + public int getMaxEnchantLevel() + { + return _maxEnchantLevel; + } + + /** + * @return the safe enchant level of this scroll/item + */ + public int getSafeEnchant() + { + return _safeEnchantLevel; + } + + /** + * @return the minimum random enchant level of this scroll/item + */ + public int getRandomEnchantMin() + { + return _randomEnchantMin; + } + + /** + * @return the maximum random enchant level of this scroll/item + */ + public int getRandomEnchantMax() + { + return _randomEnchantMax; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem + * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise + */ + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if (itemToEnchant == null) + { + return false; + } + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + { + return false; + } + else if (!isValidItemType(itemToEnchant.getItem().getType2())) + { + return false; + } + else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) + { + return false; + } + else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + { + return false; + } + return true; + } + + /** + * @param type2 + * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise + */ + private boolean isValidItemType(int type2) + { + if (type2 == ItemTemplate.TYPE2_WEAPON) + { + return isWeapon(); + } + else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) + { + return !isWeapon(); + } + return false; + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..6b234768e4 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private int _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(int slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java new file mode 100644 index 0000000000..9a80e104b0 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -0,0 +1,229 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.HashSet; +import java.util.Set; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.data.xml.EnchantItemData; +import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.stats.Stat; + +/** + * @author UnAfraid + */ +public class EnchantScroll extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isBlessedDown; + private final boolean _isSafe; + private final boolean _isGiant; + private final int _scrollGroupId; + private Set _items; + + public EnchantScroll(StatSet set) + { + super(set); + _scrollGroupId = set.getInt("scrollGroupId", 0); + + final ItemType type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN); + _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + /** + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will reset to 0), {@code false} otherwise + */ + public boolean isBlessed() + { + return _isBlessed; + } + + /** + * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise + */ + public boolean isBlessedDown() + { + return _isBlessedDown; + } + + /** + * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise + */ + public boolean isSafe() + { + return _isSafe; + } + + public boolean isGiant() + { + return _isGiant; + } + + /** + * @return id of scroll group that should be used + */ + public int getScrollGroupId() + { + return _scrollGroupId; + } + + /** + * Enforces current scroll to use only those items as possible items to enchant + * @param itemId + */ + public void addItem(int itemId) + { + if (_items == null) + { + _items = new HashSet<>(); + } + _items.add(itemId); + } + + public Set getItems() + { + return _items; + } + + /** + * @param itemToEnchant the item to be enchanted + * @param supportItem the support item used when enchanting (can be null) + * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise + */ + @Override + public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) + { + if ((_items != null) && !_items.contains(itemToEnchant.getId())) + { + return false; + } + else if ((supportItem != null)) + { + if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed())) + { + return false; + } + else if ((isBlessedDown() && !supportItem.isBlessed()) || (!isBlessedDown() && supportItem.isBlessed())) + { + return false; + } + else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant())) + { + return false; + } + else if (!supportItem.isValid(itemToEnchant, supportItem)) + { + return false; + } + else if (supportItem.isWeapon() != isWeapon()) + { + return false; + } + } + if (_items == null) + { + for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls()) + { + if (scroll.getId() == getId()) + { + continue; + } + final Set scrollItems = scroll.getItems(); + if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId())) + { + return false; + } + } + } + return super.isValid(itemToEnchant, supportItem); + } + + /** + * @param player + * @param enchantItem + * @return the chance of current scroll's group. + */ + public double getChance(Player player, Item enchantItem) + { + if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) + { + LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); + return -1; + } + + final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); + if (group == null) + { + LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); + return -1; + } + + if ((getSafeEnchant() > 0) && (enchantItem.getEnchantLevel() < getSafeEnchant())) + { + return 100; + } + + return group.getChance(enchantItem.getEnchantLevel()); + } + + /** + * @param player + * @param enchantItem + * @param supportItem + * @return the total chance for success rate of this scroll + */ + public EnchantResultType calculateSuccess(Player player, Item enchantItem, EnchantSupportItem supportItem) + { + if (!isValid(enchantItem, supportItem)) + { + return EnchantResultType.ERROR; + } + + final double chance = getChance(player, enchantItem); + if (chance == -1) + { + return EnchantResultType.ERROR; + } + + final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; + final double bonusRate = getBonusRate(); + final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; + final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100); + final double random = 100 * Rnd.nextDouble(); + final boolean success = (random < finalChance); + return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE; + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java new file mode 100644 index 0000000000..bfe1c295da --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -0,0 +1,57 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public class EnchantSupportItem extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isGiant; + private final ItemType type; + + public EnchantSupportItem(StatSet set) + { + super(set); + type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + public boolean isBlessed() + { + return _isBlessed; + } + + public boolean isGiant() + { + return _isGiant; + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 24ed8eabbf..7145865fa1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -67,14 +67,14 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemPi import org.l2jmobius.gameserver.model.events.impl.item.OnItemBypassEvent; import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java new file mode 100644 index 0000000000..c8a309674f --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -0,0 +1,88 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Crystal Type enumerated. + * @author Adry_85 + */ +public enum CrystalType +{ + NONE(0, 0, 0, 0), + D(1, 1458, 11, 90), + C(2, 1459, 6, 45), + B(3, 1460, 11, 67), + A(4, 1461, 20, 145), + S(5, 1462, 25, 250), + S80(6, 1462, 25, 250), + S84(7, 1462, 25, 250), + R(8, 17371, 30, 500), + R95(9, 17371, 30, 500), + R99(10, 17371, 30, 500), + EVENT(11, 0, 0, 0); + + private final int _level; + private final int _crystalId; + private final int _crystalEnchantBonusArmor; + private final int _crystalEnchantBonusWeapon; + + CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) + { + _level = level; + _crystalId = crystalId; + _crystalEnchantBonusArmor = crystalEnchantBonusArmor; + _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; + } + + /** + * Gets the crystal type ID. + * @return the crystal type ID + */ + public int getLevel() + { + return _level; + } + + /** + * Gets the item ID of the crystal. + * @return the item ID of the crystal + */ + public int getCrystalId() + { + return _crystalId; + } + + public int getCrystalEnchantBonusArmor() + { + return _crystalEnchantBonusArmor; + } + + public int getCrystalEnchantBonusWeapon() + { + return _crystalEnchantBonusWeapon; + } + + public boolean isGreater(CrystalType crystalType) + { + return getLevel() > crystalType.getLevel(); + } + + public boolean isLesser(CrystalType crystalType) + { + return getLevel() < crystalType.getLevel(); + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java new file mode 100644 index 0000000000..834b0c3996 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -0,0 +1,105 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * EtcItem Type enumerated. + */ +public enum EtcItemType implements ItemType +{ + NONE, + SCROLL, + ARROW, + POTION, + SPELLBOOK, + RECIPE, + MATERIAL, + PET_COLLAR, + CASTLE_GUARD, + DYE, + SEED, + SEED2, + HARVEST, + LOTTO, + RACE_TICKET, + TICKET_OF_LORD, + LURE, + CROP, + MATURECROP, + ENCHT_WP, + ENCHT_AM, + GIANT_ENCHT_WP, + GIANT_ENCHT_AM, + BLESS_ENCHT_WP, + BLESS_ENCHT_AM, + BLESS_ENCHT_AM_DOWN, + COUPON, + ELIXIR, + ENCHT_ATTR, + ENCHT_ATTR_CURSED, + BOLT, + ENCHT_ATTR_INC_PROP_ENCHT_WP, + ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, + GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, + ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, + ENCHT_ATTR_RUNE, + ENCHT_ATTRT_RUNE_SELECT, + TELEPORTBOOKMARK, + CHANGE_ATTR, + SOULSHOT, + SHAPE_SHIFTING_WP, + BLESS_SHAPE_SHIFTING_WP, + // EIT_RESTORE_SHAPE_SHIFTING_WP, + SHAPE_SHIFTING_WP_FIXED, + SHAPE_SHIFTING_AM, + BLESS_SHAPE_SHIFTING_AM, + SHAPE_SHIFTING_AM_FIXED, + SHAPE_SHIFTING_HAIRACC, + BLESS_SHAPE_SHIFTING_HAIRACC, + SHAPE_SHIFTING_HAIRACC_FIXED, + RESTORE_SHAPE_SHIFTING_WP, + RESTORE_SHAPE_SHIFTING_AM, + RESTORE_SHAPE_SHIFTING_HAIRACC, + RESTORE_SHAPE_SHIFTING_ALLITEM, + BLESS_INC_PROP_ENCHT_WP, + BLESS_INC_PROP_ENCHT_AM, + CARD_EVENT, + SHAPE_SHIFTING_ALLITEM_FIXED, + MULTI_ENCHT_WP, + MULTI_ENCHT_AM, + MULTI_INC_PROB_ENCHT_WP, + MULTI_INC_PROB_ENCHT_AM, + SOUL_CRYSTAL, + ENSOUL_STONE; + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return 0; + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 8323d4bdc7..06760564d7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e936bc8579..d41deb19b4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -51,14 +51,14 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemUnequip; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index b9441c0710..34e8773117 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 4aedd459e0..0078239bed 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,9 +40,9 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java deleted file mode 100644 index 6a27c29819..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; - -/** - * This class is dedicated to the management of armors. - */ -public class Armor extends ItemTemplate -{ - private ArmorType _type; - - /** - * Constructor for Armor. - * @param set the StatSet designating the set of couples (key,value) characterizing the armor. - */ - public Armor(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); - - final int bodyPart = getBodyPart(); - if ((bodyPart == ItemTemplate.SLOT_NECK) || ((bodyPart & ItemTemplate.SLOT_L_EAR) != 0) || ((bodyPart & ItemTemplate.SLOT_L_FINGER) != 0) || ((bodyPart & ItemTemplate.SLOT_R_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_L_BRACELET) != 0)) - { - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_ACCESSORY; - } - else - { - if ((_type == ArmorType.NONE) && (getBodyPart() == ItemTemplate.SLOT_L_HAND)) - { - _type = ArmorType.SHIELD; - } - _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; - _type2 = ItemTemplate.TYPE2_SHIELD_ARMOR; - } - } - - /** - * @return the type of the armor. - */ - @Override - public ArmorType getItemType() - { - return _type; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise - */ - @Override - public boolean isArmor() - { - return true; - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java deleted file mode 100644 index 09fdb7abcb..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Henna.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.l2jmobius.gameserver.enums.ClassId; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; - -/** - * Class for the Henna object. - * @author Zoey76 - */ -public class Henna -{ - private final int _dyeId; - private final int _dyeItemId; - private final Map _baseStats = new HashMap<>(); - private final int _wearFee; - private final int _wearCount; - private final int _cancelFee; - private final int _cancelCount; - private final int _duration; - private final List _skills; - private final List _wearClass; - - public Henna(StatSet set) - { - _dyeId = set.getInt("dyeId"); - _dyeItemId = set.getInt("dyeItemId"); - _baseStats.put(BaseStat.STR, set.getInt("str", 0)); - _baseStats.put(BaseStat.CON, set.getInt("con", 0)); - _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); - _baseStats.put(BaseStat.INT, set.getInt("int", 0)); - _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); - _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _wearFee = set.getInt("wear_fee"); - _wearCount = set.getInt("wear_count"); - _cancelFee = set.getInt("cancel_fee"); - _cancelCount = set.getInt("cancel_count"); - _duration = set.getInt("duration", -1); - _skills = new ArrayList<>(); - _wearClass = new ArrayList<>(); - } - - /** - * @return the dye Id. - */ - public int getDyeId() - { - return _dyeId; - } - - /** - * @return the item Id, required for this dye. - */ - public int getDyeItemId() - { - return _dyeItemId; - } - - public int getBaseStats(BaseStat stat) - { - return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); - } - - public Map getBaseStats() - { - return _baseStats; - } - - /** - * @return the wear fee, cost for adding this dye to the player. - */ - public int getWearFee() - { - return _wearFee; - } - - /** - * @return the wear count, the required count to add this dye to the player. - */ - public int getWearCount() - { - return _wearCount; - } - - /** - * @return the cancel fee, cost for removing this dye from the player. - */ - public int getCancelFee() - { - return _cancelFee; - } - - /** - * @return the cancel count, the retrieved amount of dye items after removing the dye. - */ - public int getCancelCount() - { - return _cancelCount; - } - - /** - * @return the duration of this dye. - */ - public int getDuration() - { - return _duration; - } - - /** - * @param skillList the list of skills related to this dye. - */ - public void setSkills(List skillList) - { - _skills.addAll(skillList); - } - - /** - * @return the skills related to this dye. - */ - public List getSkills() - { - return _skills; - } - - /** - * @return the list with the allowed classes to wear this dye. - */ - public List getAllowedWearClass() - { - return _wearClass; - } - - /** - * @param classId the class trying to wear this dye. - * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. - */ - public boolean isAllowedClass(ClassId classId) - { - return _wearClass.contains(classId); - } - - /** - * @param wearClassIds the list of classes that can wear this dye. - */ - public void setWearClassIds(List wearClassIds) - { - _wearClass.addAll(wearClassIds); - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java deleted file mode 100644 index 85bb22d23b..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is dedicated to the management of weapons. - */ -public class Weapon extends ItemTemplate -{ - private WeaponType _type; - private boolean _isMagicWeapon; - private int _soulShotCount; - private int _spiritShotCount; - private int _mpConsume; - private int _baseAttackRange; - private int _baseAttackRadius; - private int _baseAttackAngle; - private int _changeWeaponId; - - private int _reducedSoulshot; - private int _reducedSoulshotChance; - - private int _reducedMpConsume; - private int _reducedMpConsumeChance; - - private boolean _isForceEquip; - private boolean _isAttackWeapon; - private boolean _useWeaponSkillsOnly; - - /** - * Constructor for Weapon. - * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. - */ - public Weapon(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_WEAPON; - _isMagicWeapon = set.getBoolean("is_magic_weapon", false); - _soulShotCount = set.getInt("soulshots", 0); - _spiritShotCount = set.getInt("spiritshots", 0); - _mpConsume = set.getInt("mp_consume", 0); - _baseAttackRange = set.getInt("attack_range", 40); - final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) - { - _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); - } - else - { - _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 - } - - final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); - _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; - _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; - - final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); - _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; - _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; - _changeWeaponId = set.getInt("change_weaponId", 0); - _isForceEquip = set.getBoolean("isForceEquip", false); - _isAttackWeapon = set.getBoolean("isAttackWeapon", true); - _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); - } - - /** - * @return the type of Weapon - */ - @Override - public WeaponType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - @Override - public boolean isWeapon() - { - return true; - } - - /** - * @return {@code true} if the weapon is magic, {@code false} otherwise. - */ - @Override - public boolean isMagicWeapon() - { - return _isMagicWeapon; - } - - /** - * @return the quantity of SoulShot used. - */ - public int getSoulShotCount() - { - return _soulShotCount; - } - - /** - * @return the quantity of SpiritShot used. - */ - public int getSpiritShotCount() - { - return _spiritShotCount; - } - - /** - * @return the reduced quantity of SoultShot used. - */ - public int getReducedSoulShot() - { - return _reducedSoulshot; - } - - /** - * @return the chance to use Reduced SoultShot. - */ - public int getReducedSoulShotChance() - { - return _reducedSoulshotChance; - } - - /** - * @return the MP consumption with the weapon. - */ - public int getMpConsume() - { - return _mpConsume; - } - - public int getBaseAttackRange() - { - return _baseAttackRange; - } - - public int getBaseAttackRadius() - { - return _baseAttackRadius; - } - - public int getBaseAttackAngle() - { - return _baseAttackAngle; - } - - /** - * @return the reduced MP consumption with the weapon. - */ - public int getReducedMpConsume() - { - return _reducedMpConsume; - } - - /** - * @return the chance to use getReducedMpConsume() - */ - public int getReducedMpConsumeChance() - { - return _reducedMpConsumeChance; - } - - /** - * @return the Id in which weapon this weapon can be changed. - */ - public int getChangeWeaponId() - { - return _changeWeaponId; - } - - /** - * @return {@code true} if the weapon is force equip, {@code false} otherwise. - */ - public boolean isForceEquip() - { - return _isForceEquip; - } - - /** - * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. - */ - public boolean isAttackWeapon() - { - return _isAttackWeapon; - } - - /** - * @return {@code true} if the weapon is skills only, {@code false} otherwise. - */ - public boolean useWeaponSkillsOnly() - { - return _useWeaponSkillsOnly; - } - - /** - * @param caster the Creature pointing out the caster - * @param target the Creature pointing out the target - * @param trigger - * @param type - */ - public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) - { - forEachSkill(type, holder -> - { - final Skill skill = holder.getSkill(); - if (Rnd.get(100) >= holder.getChance()) - { - return; - } - - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // Trigger only if both are good or bad magic. - if (trigger.isBad() != skill.isBad()) - { - return; - } - - // No Trigger if not Magic Skill or is toggle - if (trigger.isMagic() != skill.isMagic()) - { - return; - } - - // No Trigger if skill is toggle - if (trigger.isToggle()) - { - return; - } - - if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) - { - return; - } - } - - // Skill condition not met - if (!skill.checkCondition(caster, target)) - { - return; - } - - skill.activateSkill(caster, target); - - // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // notify quests of a skill use - if (caster.isPlayer()) - { - World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); - } - if (caster.isPlayer()) - { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); - sm.addSkillName(skill); - caster.sendPacket(sm); - } - } - }); - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java deleted file mode 100644 index aafdba599e..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ /dev/null @@ -1,558 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author UnAfraid - */ -public class AppearanceStone -{ - private final int _id; - private final int _cost; - private final int _visualId; - private final long _lifeTime; - private final AppearanceType _type; - private final WeaponType _weaponType; - private final ArmorType _armorType; - private final AppearanceHandType _handType; - private final AppearanceMagicType _magicType; - private List _crystalTypes; - private List _targetTypes; - private List _bodyParts; - private List _races; - private List _racesNot; - private List _allVisualIds; - - public AppearanceStone(StatSet set) - { - _id = set.getInt("id"); - _visualId = set.getInt("visualId", 0); - _cost = set.getInt("cost", 0); - _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); - _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); - _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); - _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); - _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); - _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); - - final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); - if (targetType != AppearanceTargetType.NONE) - { - addTargetType(targetType); - } - - // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. - final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); - - // If no crystal type is defined, we must add all defaults. - if (crystalType == null) - { - switch (targetType) - { - case ACCESSORY: - case ALL: - { - addCrystalType(CrystalType.NONE); - // fallthrough - } - case WEAPON: - case ARMOR: - { - for (CrystalType cryType : CrystalType.values()) - { - if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) - { - addCrystalType(cryType); - } - } - } - } - } - else - { - addCrystalType(crystalType); - } - - final int bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); - if (bodyPart != ItemTemplate.SLOT_NONE) - { - addBodyPart(bodyPart); - } - - final Race race = set.getEnum("race", Race.class, Race.NONE); - if (race != Race.NONE) - { - addRace(race); - } - - final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); - if (raceNot != Race.NONE) - { - addRaceNot(raceNot); - } - } - - public int getId() - { - return _id; - } - - public int getVisualId() - { - return _visualId; - } - - public int getCost() - { - return _cost; - } - - public long getLifeTime() - { - return _lifeTime; - } - - public AppearanceType getType() - { - return _type; - } - - public WeaponType getWeaponType() - { - return _weaponType; - } - - public ArmorType getArmorType() - { - return _armorType; - } - - public AppearanceHandType getHandType() - { - return _handType; - } - - public AppearanceMagicType getMagicType() - { - return _magicType; - } - - public void addCrystalType(CrystalType type) - { - if (_crystalTypes == null) - { - _crystalTypes = new ArrayList<>(); - } - _crystalTypes.add(type); - } - - public List getCrystalTypes() - { - return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); - } - - public void addTargetType(AppearanceTargetType type) - { - if (_targetTypes == null) - { - _targetTypes = new ArrayList<>(); - } - _targetTypes.add(type); - } - - public List getTargetTypes() - { - return _targetTypes != null ? _targetTypes : Collections.emptyList(); - } - - public void addBodyPart(Integer part) - { - if (_bodyParts == null) - { - _bodyParts = new ArrayList<>(); - } - _bodyParts.add(part); - } - - public void addVisualId(AppearanceHolder appearanceHolder) - { - if (_allVisualIds == null) - { - _allVisualIds = new ArrayList<>(); - } - _allVisualIds.add(appearanceHolder); - } - - public List getVisualIds() - { - return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); - } - - public List getBodyParts() - { - return _bodyParts != null ? _bodyParts : Collections.emptyList(); - } - - public void addRace(Race race) - { - if (_races == null) - { - _races = new ArrayList<>(); - } - _races.add(race); - } - - public List getRaces() - { - return _races != null ? _races : Collections.emptyList(); - } - - public void addRaceNot(Race race) - { - if (_racesNot == null) - { - _racesNot = new ArrayList<>(); - } - _racesNot.add(race); - } - - public List getRacesNot() - { - return _racesNot != null ? _racesNot : Collections.emptyList(); - } - - /** - * @param player the actor requesting to use this appearance. - * @param targetItem the item to be modified with this appearance. - * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. - */ - public boolean checkConditions(Player player, Item targetItem) - { - if (targetItem == null) - { - return false; - } - - if (getTargetTypes().isEmpty()) - { - return false; - } - - if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); - return false; - } - - switch (_type) - { - case RESTORE: - { - if (targetItem.getVisualId() == 0) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); - return false; - } - - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - default: - { - // Seems like in retail item with already changed appearance, can be changed again without being restored. - - final AppearanceTargetType targetType = getTargetTypes().get(0); - switch (targetType) - { - case NONE: - { - return false; - } - case WEAPON: - { - if (!targetItem.isWeapon()) - { - player.sendPacket(SystemMessageId.WEAPONS_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ARMOR: - { - if (!targetItem.isArmor()) - { - player.sendPacket(SystemMessageId.ARMOR_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ACCESSORY: - { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) - { - player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); - return false; - } - break; - } - case ALL: - { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (findVisualChange(targetItem) == null) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - return true; - } - } - break; - } - } - - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (_weaponType != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) - { - if (_weaponType != WeaponType.CROSSBOW) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - } - - switch (_handType) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - } - - switch (_magicType) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - if (_armorType != ArmorType.NONE) - { - switch (_armorType) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - return true; - } - - public AppearanceHolder findVisualChange(Item targetItem) - { - for (AppearanceHolder holder : _allVisualIds) - { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) - { - continue; - } - - if (holder.getWeaponType() != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) - { - if (holder.getWeaponType() != WeaponType.CROSSBOW) - { - continue; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - continue; - } - } - - switch (holder.getHandType()) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - continue; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - continue; - } - break; - } - } - - switch (holder.getMagicType()) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - continue; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - continue; - } - } - } - } - - if (holder.getArmorType() != ArmorType.NONE) - { - switch (holder.getArmorType()) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - continue; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - continue; - } - } - } - } - return holder; - } - return null; - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java deleted file mode 100644 index a2897ba911..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import java.util.EnumMap; -import java.util.Map; - -import org.l2jmobius.gameserver.model.StatSet; - -/** - * @author UnAfraid - */ -public class CombinationItem -{ - private final int _itemOne; - private final int _itemTwo; - private final int _chance; - private final Map _rewards = new EnumMap<>(CombinationItemType.class); - - public CombinationItem(StatSet set) - { - _itemOne = set.getInt("one"); - _itemTwo = set.getInt("two"); - _chance = set.getInt("chance"); - } - - public int getItemOne() - { - return _itemOne; - } - - public int getItemTwo() - { - return _itemTwo; - } - - public int getChance() - { - return _chance; - } - - public void addReward(CombinationItemReward item) - { - _rewards.put(item.getType(), item); - } - - public CombinationItemReward getReward(CombinationItemType type) - { - return _rewards.get(type); - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java deleted file mode 100644 index a09b01d571..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.logging.Logger; - -import org.l2jmobius.commons.util.CommonUtil; -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public abstract class AbstractEnchantItem -{ - protected static final Logger LOGGER = Logger.getLogger(AbstractEnchantItem.class.getName()); - - private static final ItemType[] ENCHANT_TYPES = new ItemType[] - { - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - EtcItemType.BLESS_ENCHT_AM, - EtcItemType.BLESS_ENCHT_AM_DOWN, - EtcItemType.BLESS_ENCHT_WP, - EtcItemType.ENCHT_AM, - EtcItemType.ENCHT_WP, - EtcItemType.GIANT_ENCHT_AM, - EtcItemType.GIANT_ENCHT_WP, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - }; - - private final int _id; - private final CrystalType _grade; - private final int _minEnchantLevel; - private final int _maxEnchantLevel; - private final int _safeEnchantLevel; - private final int _randomEnchantMin; - private final int _randomEnchantMax; - private final double _bonusRate; - - public AbstractEnchantItem(StatSet set) - { - _id = set.getInt("id"); - if (getItem() == null) - { - throw new NullPointerException(); - } - else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType())) - { - throw new IllegalAccessError(); - } - _grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE); - _minEnchantLevel = set.getInt("minEnchant", 0); - _maxEnchantLevel = set.getInt("maxEnchant", 127); - _safeEnchantLevel = set.getInt("safeEnchant", 0); - _randomEnchantMin = set.getInt("randomEnchantMin", 1); - _randomEnchantMax = set.getInt("randomEnchantMax", _randomEnchantMin); - _bonusRate = set.getDouble("bonusRate", 0); - } - - /** - * @return id of current item - */ - public int getId() - { - return _id; - } - - /** - * @return bonus chance that would be added - */ - public double getBonusRate() - { - return _bonusRate; - } - - /** - * @return {@link ItemTemplate} current item/scroll - */ - public ItemTemplate getItem() - { - return ItemTable.getInstance().getTemplate(_id); - } - - /** - * @return grade of the item/scroll. - */ - public CrystalType getGrade() - { - return _grade; - } - - /** - * @return {@code true} if scroll is for weapon, {@code false} for armor - */ - public abstract boolean isWeapon(); - - /** - * @return the minimum enchant level that this scroll/item can be used with - */ - public int getMinEnchantLevel() - { - return _minEnchantLevel; - } - - /** - * @return the maximum enchant level that this scroll/item can be used with - */ - public int getMaxEnchantLevel() - { - return _maxEnchantLevel; - } - - /** - * @return the safe enchant level of this scroll/item - */ - public int getSafeEnchant() - { - return _safeEnchantLevel; - } - - /** - * @return the minimum random enchant level of this scroll/item - */ - public int getRandomEnchantMin() - { - return _randomEnchantMin; - } - - /** - * @return the maximum random enchant level of this scroll/item - */ - public int getRandomEnchantMax() - { - return _randomEnchantMax; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem - * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise - */ - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if (itemToEnchant == null) - { - return false; - } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) - { - return false; - } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) - { - return false; - } - else if (((_minEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() < _minEnchantLevel)) || ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() >= _maxEnchantLevel))) - { - return false; - } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) - { - return false; - } - return true; - } - - /** - * @param type2 - * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise - */ - private boolean isValidItemType(int type2) - { - if (type2 == ItemTemplate.TYPE2_WEAPON) - { - return isWeapon(); - } - else if ((type2 == ItemTemplate.TYPE2_SHIELD_ARMOR) || (type2 == ItemTemplate.TYPE2_ACCESSORY)) - { - return !isWeapon(); - } - return false; - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fb23338d90..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private int _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(int slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java deleted file mode 100644 index e2c2f6ad68..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ /dev/null @@ -1,229 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.HashSet; -import java.util.Set; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.data.xml.EnchantItemData; -import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.stats.Stat; - -/** - * @author UnAfraid - */ -public class EnchantScroll extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isBlessedDown; - private final boolean _isSafe; - private final boolean _isGiant; - private final int _scrollGroupId; - private Set _items; - - public EnchantScroll(StatSet set) - { - super(set); - _scrollGroupId = set.getInt("scrollGroupId", 0); - - final ItemType type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESS_ENCHT_AM) || (type == EtcItemType.BLESS_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessedDown = (type == EtcItemType.BLESS_ENCHT_AM_DOWN); - _isSafe = (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ENCHT_ATTR_CRYSTAL_ENCHANT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - /** - * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will reset to 0), {@code false} otherwise - */ - public boolean isBlessed() - { - return _isBlessed; - } - - /** - * @return {@code true} for blessed scrolls (enchanted item will remain on failure and enchant value will go down by 1), {@code false} otherwise - */ - public boolean isBlessedDown() - { - return _isBlessedDown; - } - - /** - * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise - */ - public boolean isSafe() - { - return _isSafe; - } - - public boolean isGiant() - { - return _isGiant; - } - - /** - * @return id of scroll group that should be used - */ - public int getScrollGroupId() - { - return _scrollGroupId; - } - - /** - * Enforces current scroll to use only those items as possible items to enchant - * @param itemId - */ - public void addItem(int itemId) - { - if (_items == null) - { - _items = new HashSet<>(); - } - _items.add(itemId); - } - - public Set getItems() - { - return _items; - } - - /** - * @param itemToEnchant the item to be enchanted - * @param supportItem the support item used when enchanting (can be null) - * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise - */ - @Override - public boolean isValid(Item itemToEnchant, EnchantSupportItem supportItem) - { - if ((_items != null) && !_items.contains(itemToEnchant.getId())) - { - return false; - } - else if ((supportItem != null)) - { - if ((isBlessed() && !supportItem.isBlessed()) || (!isBlessed() && supportItem.isBlessed())) - { - return false; - } - else if ((isBlessedDown() && !supportItem.isBlessed()) || (!isBlessedDown() && supportItem.isBlessed())) - { - return false; - } - else if ((isGiant() && !supportItem.isGiant()) || (!isGiant() && supportItem.isGiant())) - { - return false; - } - else if (!supportItem.isValid(itemToEnchant, supportItem)) - { - return false; - } - else if (supportItem.isWeapon() != isWeapon()) - { - return false; - } - } - if (_items == null) - { - for (EnchantScroll scroll : EnchantItemData.getInstance().getScrolls()) - { - if (scroll.getId() == getId()) - { - continue; - } - final Set scrollItems = scroll.getItems(); - if ((scrollItems != null) && scrollItems.contains(itemToEnchant.getId())) - { - return false; - } - } - } - return super.isValid(itemToEnchant, supportItem); - } - - /** - * @param player - * @param enchantItem - * @return the chance of current scroll's group. - */ - public double getChance(Player player, Item enchantItem) - { - if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Unexistent enchant scroll group specified for enchant scroll: " + getId()); - return -1; - } - - final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId); - if (group == null) - { - LOGGER.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); - return -1; - } - - if ((getSafeEnchant() > 0) && (enchantItem.getEnchantLevel() < getSafeEnchant())) - { - return 100; - } - - return group.getChance(enchantItem.getEnchantLevel()); - } - - /** - * @param player - * @param enchantItem - * @param supportItem - * @return the total chance for success rate of this scroll - */ - public EnchantResultType calculateSuccess(Player player, Item enchantItem, EnchantSupportItem supportItem) - { - if (!isValid(enchantItem, supportItem)) - { - return EnchantResultType.ERROR; - } - - final double chance = getChance(player, enchantItem); - if (chance == -1) - { - return EnchantResultType.ERROR; - } - - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); - final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; - final double bonusRate = getBonusRate(); - final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; - final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100); - final double random = 100 * Rnd.nextDouble(); - final boolean success = (random < finalChance); - return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE; - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java deleted file mode 100644 index 13d6b5a2ee..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public class EnchantSupportItem extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isGiant; - private final ItemType type; - - public EnchantSupportItem(StatSet set) - { - super(set); - type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - public boolean isBlessed() - { - return _isBlessed; - } - - public boolean isGiant() - { - return _isGiant; - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java deleted file mode 100644 index d059efd025..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Crystal Type enumerated. - * @author Adry_85 - */ -public enum CrystalType -{ - NONE(0, 0, 0, 0), - D(1, 1458, 11, 90), - C(2, 1459, 6, 45), - B(3, 1460, 11, 67), - A(4, 1461, 20, 145), - S(5, 1462, 25, 250), - S80(6, 1462, 25, 250), - S84(7, 1462, 25, 250), - R(8, 17371, 30, 500), - R95(9, 17371, 30, 500), - R99(10, 17371, 30, 500), - EVENT(11, 0, 0, 0); - - private final int _level; - private final int _crystalId; - private final int _crystalEnchantBonusArmor; - private final int _crystalEnchantBonusWeapon; - - CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) - { - _level = level; - _crystalId = crystalId; - _crystalEnchantBonusArmor = crystalEnchantBonusArmor; - _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; - } - - /** - * Gets the crystal type ID. - * @return the crystal type ID - */ - public int getLevel() - { - return _level; - } - - /** - * Gets the item ID of the crystal. - * @return the item ID of the crystal - */ - public int getCrystalId() - { - return _crystalId; - } - - public int getCrystalEnchantBonusArmor() - { - return _crystalEnchantBonusArmor; - } - - public int getCrystalEnchantBonusWeapon() - { - return _crystalEnchantBonusWeapon; - } - - public boolean isGreater(CrystalType crystalType) - { - return getLevel() > crystalType.getLevel(); - } - - public boolean isLesser(CrystalType crystalType) - { - return getLevel() < crystalType.getLevel(); - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java deleted file mode 100644 index b352bd7fc0..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * EtcItem Type enumerated. - */ -public enum EtcItemType implements ItemType -{ - NONE, - SCROLL, - ARROW, - POTION, - SPELLBOOK, - RECIPE, - MATERIAL, - PET_COLLAR, - CASTLE_GUARD, - DYE, - SEED, - SEED2, - HARVEST, - LOTTO, - RACE_TICKET, - TICKET_OF_LORD, - LURE, - CROP, - MATURECROP, - ENCHT_WP, - ENCHT_AM, - GIANT_ENCHT_WP, - GIANT_ENCHT_AM, - BLESS_ENCHT_WP, - BLESS_ENCHT_AM, - BLESS_ENCHT_AM_DOWN, - COUPON, - ELIXIR, - ENCHT_ATTR, - ENCHT_ATTR_CURSED, - BOLT, - ENCHT_ATTR_INC_PROP_ENCHT_WP, - ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP, - GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM, - ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP, - ENCHT_ATTR_RUNE, - ENCHT_ATTRT_RUNE_SELECT, - TELEPORTBOOKMARK, - CHANGE_ATTR, - SOULSHOT, - SHAPE_SHIFTING_WP, - BLESS_SHAPE_SHIFTING_WP, - // EIT_RESTORE_SHAPE_SHIFTING_WP, - SHAPE_SHIFTING_WP_FIXED, - SHAPE_SHIFTING_AM, - BLESS_SHAPE_SHIFTING_AM, - SHAPE_SHIFTING_AM_FIXED, - SHAPE_SHIFTING_HAIRACC, - BLESS_SHAPE_SHIFTING_HAIRACC, - SHAPE_SHIFTING_HAIRACC_FIXED, - RESTORE_SHAPE_SHIFTING_WP, - RESTORE_SHAPE_SHIFTING_AM, - RESTORE_SHAPE_SHIFTING_HAIRACC, - RESTORE_SHAPE_SHIFTING_ALLITEM, - BLESS_INC_PROP_ENCHT_WP, - BLESS_INC_PROP_ENCHT_AM, - CARD_EVENT, - SHAPE_SHIFTING_ALLITEM_FIXED, - MULTI_ENCHT_WP, - MULTI_ENCHT_AM, - MULTI_INC_PROB_ENCHT_WP, - MULTI_INC_PROB_ENCHT_AM, - SOUL_CRYSTAL, - ENSOUL_STONE; - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return 0; - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index c807e1298e..0fcb8c33e4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 5bf10abc0f..7929fbbe60 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java index 7d30237cb1..d9c41811d2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java index 80eec709d8..1e18bcb9ad 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 527e0b0938..f93380fc15 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -57,10 +57,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 777ba0c3c7..ba26674462 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -38,11 +38,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 9a8ea5b2a9..7abbc9dc6b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 98ad03f40d..5e9d4175d5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index 5422c2ab5d..06a4c55662 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 38a7116383..ff0ad75b8a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 043806dfb4..d8f3930287 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 1839afb5ce..334fb9252a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 7109a54ed1..5df6b208a3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index 165f9b4668..80e30184ff 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index df3acc3df1..7c51b0ad38 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index bab0af38a8..1c31ff4a11 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index b990827072..a1bdc7a4ab 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index f467c9e4c3..e25524223a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 822e675d55..361ba315ae 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 5eeb24540d..677119b0b1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 543774b24c..e1c584d405 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 8e4db9d92c..a7e3f28ed6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 9dfcf81ebd..5d4b260a76 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 85dbfd4647..ed78abf81d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index eee07594d3..c67449efed 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 48a67946e9..3ee4350b8d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index f4f7be7793..2c515301ca 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 21dcd2d13d..9565b3e5ca 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 6b1a6a94e8..1b20e2e248 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java index 96d170857a..2330851024 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java index 7e7abde686..66fb839f0e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index ce98ab493d..d0add3fa49 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 595da81538..ab9f0c33f7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 945ff531e4..b9c3900403 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 8626434905..e4376f9ad5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java index c162bec01c..e8d53e1a19 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index d92fbb028a..26cfaf9835 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PetItemList; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index d498c232c5..d66024cc52 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index d0f951adc1..62229cbdeb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index 13b2d241e5..33a10fd20c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index fb025563e6..d7d4d2b449 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 60cfa6b927..6d1eea218a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 4c5880c23a..ee93527570 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 6bc227a559..3de872e222 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index e6fe5c8fca..0139a96c31 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 14252bc1f9..1006dca5ad 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -37,11 +37,11 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index f144094dda..95a85c269b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 79d0cb5169..315704e4e5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index e7a8e8baf6..7fbd7ebecb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index fe93b7e139..c0eb970566 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 56cf3b84cc..b9a7aadbf7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index a4f0ecaefb..d5690408da 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51f689b277..8b40712b46 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index a7c65ef045..50240f97cf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.enums.ItemListType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 66deec1711..609968c3ac 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 3ec3d494e8..db168592f1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 942a5f1cdc..b739a94c55 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 235c3abacf..29d5eafeef 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c9e5eabc7..ef1d37297e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index a8903175db..f212539af7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index b690bd9455..c14caa76e0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 312fd10338..9ab9f0a836 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 6d0df16c27..0e6e64c7b2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 61a01d067c..658087380a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 84bc5a6eba..3800940bac 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 62efb91d9e..a79c0f59f2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index e744eecbdd..8735b315b6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 27b4180f3c..89a6a19563 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index faf957b0c9..d499719f31 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 9d0498fdf4..5b43daa74b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 6efc979cdc..e4cf35779f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PetItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index f27cf60885..bb462b6cd2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index d8f88333df..df50db952f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index f042bb59e2..b93579e510 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index d48b66c6ef..9d9b24a54f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 84ee2d06c6..470ce757db 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index bcc376c327..455305ce79 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index fcc27f821d..64fb395dda 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 1cf1f17260..876a24c7ad 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java index 65e18e4a0e..bcbe96ad19 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -46,6 +46,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -134,9 +137,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java index c2fcfca5e6..f14df032ed 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPremiumManagerShowHtml; import org.l2jmobius.gameserver.network.serverpackets.ExShowVariationCancelWindow; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/SiegeGuards.java index 8ac4fe72af..c9ca7df743 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index fa45b28c67..42d382f269 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index dd4215411e..a8e6c06eed 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 7c2572fa42..14325a32cf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 5b1db54836..e7113941ec 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index f73f3c2e73..5d3caadfd5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index dcff53c86d..98919a85ec 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 978b338c06..d2a939b605 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index ef698d3144..98c614b7e5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index e1681d19a4..8e1d2e4ebd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 4e5a8d7aaf..1950403a0d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index 1d104a4069..bb6ed54b11 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 6e043ac66c..f5c8d5972d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index e52e649f3c..d7a25309f2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 437b502a95..b8985f0fef 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 025ceedd06..613bba57ff 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index 1866a34d94..b7c74b3b74 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 7f55fdc9ed..7e0edf65b8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 1712fe6e34..da6af99db9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 28b0f453fc..5c2f25e7f2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 2ed9c1c346..7f5e0e87a1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index ebbd33bda0..f952b58fa2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 94958b7956..bd1cbe6e09 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 3f5e92bb2e..65bd99edef 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 1bb129993f..3cfcc73e45 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Hp.java index ceb2e22058..6d6bc006aa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index f0dcef68c8..a503aab636 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 02468039cf..742f98e38b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index 8bbb0e59a5..b995cc61c1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyCraftPoints.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyCraftPoints.java index 49518c6b1d..ba3a1ceb95 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyCraftPoints.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyCraftPoints.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyDeathPoints.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyDeathPoints.java index c9435e06a8..1a18c4d1e2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyDeathPoints.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyDeathPoints.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyMagicLampPoints.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyMagicLampPoints.java index 118dd8ac0c..fe8710dea5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyMagicLampPoints.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyMagicLampPoints.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 742ca00283..3d97c9ac22 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 3eb4d77710..8b4d315b50 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 658563aca3..6d5cc2cb9b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 533e839854..39b2180787 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index aaa9641567..721bf8ce08 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index b2c24db4d9..c1996baf44 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 9b000811ff..382c248297 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java index 326bd6a9cc..ae8351148e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 090580340e..8df6b0b267 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index d65939613a..87dec4a24c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b4ea6e761f..bfc5324c4d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index b3a566f95c..147c88b3c8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetEvolveHolder; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 83860039e2..a22aaf477d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/VipUp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/VipUp.java index 9cf1267bbb..f716953da2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/VipUp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/VipUp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 96033d321b..5f0a327962 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java index ad487044b9..db8516fac9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ElementalSpirit; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index ecb73b365e..30e5fd51af 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 47b2418ab8..ab876ab449 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index ba621c653f..f553a0c846 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 9b16668969..119fe1f81e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BlessingScrolls.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BlessingScrolls.java index e2ba792dd5..2d475bb669 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BlessingScrolls.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/BlessingScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.BlessingItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.blessing.ExOpenBlessOptionScroll; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index 2ce753368d..c823bbe457 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index d7008524ad..6ed099eccf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 4cebf9c999..9731abbc15 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 899b682c18..bc5244b878 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 5c0399e986..1e3613fc0c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java index a64172c3dc..40cb212cfd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 70ca58da2a..105834d461 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 05a3885973..461e78bb8b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index c6d8ec7a1b..1f44066740 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 98ae8c4eaf..353347df87 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index 3988e77104..587f809dc9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 77b9a03185..c0d47bc8de 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java index fd838d6543..3e1d0864d8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java @@ -19,7 +19,7 @@ package quests.Q10971_TalismanEnchant; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java index 1c6af00799..dbb98bc9bc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java @@ -18,7 +18,7 @@ package quests.Q10973_EnchantingAgathions; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java index c416715495..f336600408 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java @@ -19,7 +19,7 @@ package quests.Q10974_NewStylishEquipment; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/CreatureAI.java index bb78cafa1c..670e0a7192 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/ItemTable.java index 5fdb316882..439c38d1e5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -48,12 +48,12 @@ import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.AmmunitionSkillList; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index a9849da481..294321be58 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.PetEvolveHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index 313709ab07..4b2cf3b555 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 0f8815bcc4..475f0085d8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index d134fe859e..c57e62c683 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index c76a9d67f7..b77739dcc0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java index 1cf9e8beea..7097281f21 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.LimitShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius, GustavoFonseca diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java index 0d9028c9ae..7410d00a2a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.LimitShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/RandomCraftData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/RandomCraftData.java index 57122b712d..2914ecf635 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/RandomCraftData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/RandomCraftData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.RandomCraftExtractDataHolder; import org.l2jmobius.gameserver.model.holders.RandomCraftRewardDataHolder; import org.l2jmobius.gameserver.model.holders.RandomCraftRewardItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mode, Mobius diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 0cb9fed9fa..e07f7d9f64 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/VariationData.java index 392612cd2d..c29a10baa2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index 1b5d73308d..4ed0600683 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 179b4467c3..2ce3e815cc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index ba3ab89b07..20d23bc7fc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 62cae0c9a4..8e54f910ea 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -35,9 +35,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index ce03808800..7799768d15 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ArmorSet.java index 2a57f20a10..6b504526ef 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CombatFlag.java index e726f912f1..e0487f9079 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 141e0af973..94118c482b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ItemInfo.java index d96a043814..6787a5376b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.PetEvolveHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Party.java index ba7db00a30..8d9082211b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Party.java @@ -46,8 +46,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ShortCuts.java index d199976edc..a9fd529ecc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TradeItem.java index 2fee1b22b4..adc501d705 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TradeList.java index bbafcb1416..bea714862c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java index d0c0ba5e0b..bb07f52b7c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -67,8 +67,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java index 114f9e9cb1..46bd5ece94 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -116,12 +116,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java index a4e8e31909..53789c66e4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -75,8 +75,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java index e7da7261c1..3652b19ce2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -244,6 +244,15 @@ import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; @@ -251,15 +260,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRandomCraft; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java index 6b93a1c89f..2212b214be 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 07a0c9def7..0058ca55dd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -62,11 +62,11 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.PetEvolveHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index a30daaaa95..66d6c903e4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index 6d0c4d66fa..2ad4775ebe 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index ebce1675a6..2367cbb941 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index fdba2945a9..6f5734a1d7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 6e4bcf98c1..a191dfbab5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SubClassHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 29208b2b65..8e5328b099 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index a909041435..d9b47053dc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -40,8 +40,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9f908898ea..ebdbe02899 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index d60e1343b9..1f55ed1bae 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 2e75866e00..0b472089a8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index fcd8e14da5..2613a1847b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index b778a112b9..e6ea3ab07d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index fc9320c7a7..5ccfc2ab1d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.SoulType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index a5fea7c6f6..347f281026 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index ea0cef1aee..9fa5d2bdad 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -130,15 +130,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index e202b08913..3e94350ad8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 79c69f739d..41f554b9e0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index b86121305d..b18ff0fce9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Armor.java similarity index 92% rename from L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Armor.java rename to L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Armor.java index d11c43f9cc..f65945c191 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; /** * This class is dedicated to the management of armors. diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Henna.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Henna.java new file mode 100644 index 0000000000..d029309b0f --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -0,0 +1,171 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; + +/** + * Class for the Henna object. + * @author Zoey76 + */ +public class Henna +{ + private final int _dyeId; + private final int _dyeItemId; + private final Map _baseStats = new HashMap<>(); + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final int _duration; + private final List _skills; + private final List _wearClass; + + public Henna(StatSet set) + { + _dyeId = set.getInt("dyeId"); + _dyeItemId = set.getInt("dyeItemId"); + _baseStats.put(BaseStat.STR, set.getInt("str", 0)); + _baseStats.put(BaseStat.CON, set.getInt("con", 0)); + _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); + _baseStats.put(BaseStat.INT, set.getInt("int", 0)); + _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); + _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _duration = set.getInt("duration", -1); + _skills = new ArrayList<>(); + _wearClass = new ArrayList<>(); + } + + /** + * @return the dye Id. + */ + public int getDyeId() + { + return _dyeId; + } + + /** + * @return the item Id, required for this dye. + */ + public int getDyeItemId() + { + return _dyeItemId; + } + + public int getBaseStats(BaseStat stat) + { + return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); + } + + public Map getBaseStats() + { + return _baseStats; + } + + /** + * @return the wear fee, cost for adding this dye to the player. + */ + public int getWearFee() + { + return _wearFee; + } + + /** + * @return the wear count, the required count to add this dye to the player. + */ + public int getWearCount() + { + return _wearCount; + } + + /** + * @return the cancel fee, cost for removing this dye from the player. + */ + public int getCancelFee() + { + return _cancelFee; + } + + /** + * @return the cancel count, the retrieved amount of dye items after removing the dye. + */ + public int getCancelCount() + { + return _cancelCount; + } + + /** + * @return the duration of this dye. + */ + public int getDuration() + { + return _duration; + } + + /** + * @param skillList the list of skills related to this dye. + */ + public void setSkills(List skillList) + { + _skills.addAll(skillList); + } + + /** + * @return the skills related to this dye. + */ + public List getSkills() + { + return _skills; + } + + /** + * @return the list with the allowed classes to wear this dye. + */ + public List getAllowedWearClass() + { + return _wearClass; + } + + /** + * @param classId the class trying to wear this dye. + * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. + */ + public boolean isAllowedClass(ClassId classId) + { + return _wearClass.contains(classId); + } + + /** + * @param wearClassIds the list of classes that can wear this dye. + */ + public void setWearClassIds(List wearClassIds) + { + _wearClass.addAll(wearClassIds); + } +} \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index 56b14ad5c7..76131b3078 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 91% rename from L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index 5b9babb699..909b5453b2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.Collection; import java.util.Objects; @@ -22,9 +22,9 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Weapon.java new file mode 100644 index 0000000000..4599d5047f --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -0,0 +1,311 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.enums.ItemSkillType; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is dedicated to the management of weapons. + */ +public class Weapon extends ItemTemplate +{ + private WeaponType _type; + private boolean _isMagicWeapon; + private int _soulShotCount; + private int _spiritShotCount; + private int _mpConsume; + private int _baseAttackRange; + private int _baseAttackRadius; + private int _baseAttackAngle; + private int _changeWeaponId; + + private int _reducedSoulshot; + private int _reducedSoulshotChance; + + private int _reducedMpConsume; + private int _reducedMpConsumeChance; + + private boolean _isForceEquip; + private boolean _isAttackWeapon; + private boolean _useWeaponSkillsOnly; + + /** + * Constructor for Weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. + */ + public Weapon(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_WEAPON; + _isMagicWeapon = set.getBoolean("is_magic_weapon", false); + _soulShotCount = set.getInt("soulshots", 0); + _spiritShotCount = set.getInt("spiritshots", 0); + _mpConsume = set.getInt("mp_consume", 0); + _baseAttackRange = set.getInt("attack_range", 40); + final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) + { + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + } + else + { + _baseAttackRadius = 40; + _baseAttackAngle = 240; // 360 - 120 + } + + final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); + _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; + _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; + + final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); + _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; + _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; + _changeWeaponId = set.getInt("change_weaponId", 0); + _isForceEquip = set.getBoolean("isForceEquip", false); + _isAttackWeapon = set.getBoolean("isAttackWeapon", true); + _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); + } + + /** + * @return the type of Weapon + */ + @Override + public WeaponType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + @Override + public boolean isWeapon() + { + return true; + } + + /** + * @return {@code true} if the weapon is magic, {@code false} otherwise. + */ + @Override + public boolean isMagicWeapon() + { + return _isMagicWeapon; + } + + /** + * @return the quantity of SoulShot used. + */ + public int getSoulShotCount() + { + return _soulShotCount; + } + + /** + * @return the quantity of SpiritShot used. + */ + public int getSpiritShotCount() + { + return _spiritShotCount; + } + + /** + * @return the reduced quantity of SoultShot used. + */ + public int getReducedSoulShot() + { + return _reducedSoulshot; + } + + /** + * @return the chance to use Reduced SoultShot. + */ + public int getReducedSoulShotChance() + { + return _reducedSoulshotChance; + } + + /** + * @return the MP consumption with the weapon. + */ + public int getMpConsume() + { + return _mpConsume; + } + + public int getBaseAttackRange() + { + return _baseAttackRange; + } + + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + + /** + * @return the reduced MP consumption with the weapon. + */ + public int getReducedMpConsume() + { + return _reducedMpConsume; + } + + /** + * @return the chance to use getReducedMpConsume() + */ + public int getReducedMpConsumeChance() + { + return _reducedMpConsumeChance; + } + + /** + * @return the Id in which weapon this weapon can be changed. + */ + public int getChangeWeaponId() + { + return _changeWeaponId; + } + + /** + * @return {@code true} if the weapon is force equip, {@code false} otherwise. + */ + public boolean isForceEquip() + { + return _isForceEquip; + } + + /** + * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. + */ + public boolean isAttackWeapon() + { + return _isAttackWeapon; + } + + /** + * @return {@code true} if the weapon is skills only, {@code false} otherwise. + */ + public boolean useWeaponSkillsOnly() + { + return _useWeaponSkillsOnly; + } + + /** + * @param caster the Creature pointing out the caster + * @param target the Creature pointing out the target + * @param trigger + * @param type + */ + public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) + { + forEachSkill(type, holder -> + { + final Skill skill = holder.getSkill(); + if (Rnd.get(100) >= holder.getChance()) + { + return; + } + + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // Trigger only if both are good or bad magic. + if (trigger.isBad() != skill.isBad()) + { + return; + } + + // No Trigger if not Magic Skill or is toggle + if (trigger.isMagic() != skill.isMagic()) + { + return; + } + + // No Trigger if skill is toggle + if (trigger.isToggle()) + { + return; + } + + if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) + { + return; + } + } + + // Skill condition not met + if (!skill.checkCondition(caster, target, true)) + { + return; + } + + skill.activateSkill(caster, target); + + // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // notify quests of a skill use + if (caster.isPlayer()) + { + World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); + } + if (caster.isPlayer()) + { + final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); + sm.addSkillName(skill); + caster.sendPacket(sm); + } + } + }); + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java new file mode 100644 index 0000000000..610e720125 --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -0,0 +1,558 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.network.SystemMessageId; + +/** + * @author UnAfraid + */ +public class AppearanceStone +{ + private final int _id; + private final int _cost; + private final int _visualId; + private final long _lifeTime; + private final AppearanceType _type; + private final WeaponType _weaponType; + private final ArmorType _armorType; + private final AppearanceHandType _handType; + private final AppearanceMagicType _magicType; + private List _crystalTypes; + private List _targetTypes; + private List _bodyParts; + private List _races; + private List _racesNot; + private List _allVisualIds; + + public AppearanceStone(StatSet set) + { + _id = set.getInt("id"); + _visualId = set.getInt("visualId", 0); + _cost = set.getInt("cost", 0); + _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); + _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); + _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); + _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); + _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); + _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); + + final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); + if (targetType != AppearanceTargetType.NONE) + { + addTargetType(targetType); + } + + // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. + final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); + + // If no crystal type is defined, we must add all defaults. + if (crystalType == null) + { + switch (targetType) + { + case ACCESSORY: + case ALL: + { + addCrystalType(CrystalType.NONE); + // fallthrough + } + case WEAPON: + case ARMOR: + { + for (CrystalType cryType : CrystalType.values()) + { + if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) + { + addCrystalType(cryType); + } + } + } + } + } + else + { + addCrystalType(crystalType); + } + + final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); + if (bodyPart != ItemTemplate.SLOT_NONE) + { + addBodyPart(bodyPart); + } + + final Race race = set.getEnum("race", Race.class, Race.NONE); + if (race != Race.NONE) + { + addRace(race); + } + + final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); + if (raceNot != Race.NONE) + { + addRaceNot(raceNot); + } + } + + public int getId() + { + return _id; + } + + public int getVisualId() + { + return _visualId; + } + + public int getCost() + { + return _cost; + } + + public long getLifeTime() + { + return _lifeTime; + } + + public AppearanceType getType() + { + return _type; + } + + public WeaponType getWeaponType() + { + return _weaponType; + } + + public ArmorType getArmorType() + { + return _armorType; + } + + public AppearanceHandType getHandType() + { + return _handType; + } + + public AppearanceMagicType getMagicType() + { + return _magicType; + } + + public void addCrystalType(CrystalType type) + { + if (_crystalTypes == null) + { + _crystalTypes = new ArrayList<>(); + } + _crystalTypes.add(type); + } + + public List getCrystalTypes() + { + return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); + } + + public void addTargetType(AppearanceTargetType type) + { + if (_targetTypes == null) + { + _targetTypes = new ArrayList<>(); + } + _targetTypes.add(type); + } + + public List getTargetTypes() + { + return _targetTypes != null ? _targetTypes : Collections.emptyList(); + } + + public void addBodyPart(long part) + { + if (_bodyParts == null) + { + _bodyParts = new ArrayList<>(); + } + _bodyParts.add(part); + } + + public void addVisualId(AppearanceHolder appearanceHolder) + { + if (_allVisualIds == null) + { + _allVisualIds = new ArrayList<>(); + } + _allVisualIds.add(appearanceHolder); + } + + public List getVisualIds() + { + return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); + } + + public List getBodyParts() + { + return _bodyParts != null ? _bodyParts : Collections.emptyList(); + } + + public void addRace(Race race) + { + if (_races == null) + { + _races = new ArrayList<>(); + } + _races.add(race); + } + + public List getRaces() + { + return _races != null ? _races : Collections.emptyList(); + } + + public void addRaceNot(Race race) + { + if (_racesNot == null) + { + _racesNot = new ArrayList<>(); + } + _racesNot.add(race); + } + + public List getRacesNot() + { + return _racesNot != null ? _racesNot : Collections.emptyList(); + } + + /** + * @param player the actor requesting to use this appearance. + * @param targetItem the item to be modified with this appearance. + * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. + */ + public boolean checkConditions(Player player, Item targetItem) + { + if (targetItem == null) + { + return false; + } + + if (getTargetTypes().isEmpty()) + { + return false; + } + + if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); + return false; + } + + switch (_type) + { + case RESTORE: + { + if (targetItem.getVisualId() == 0) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); + return false; + } + + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + default: + { + // Seems like in retail item with already changed appearance, can be changed again without being restored. + + final AppearanceTargetType targetType = getTargetTypes().get(0); + switch (targetType) + { + case NONE: + { + return false; + } + case WEAPON: + { + if (!targetItem.isWeapon()) + { + player.sendPacket(SystemMessageId.WEAPONS_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ARMOR: + { + if (!targetItem.isArmor()) + { + player.sendPacket(SystemMessageId.ARMOR_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ACCESSORY: + { + if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + { + player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); + return false; + } + break; + } + case ALL: + { + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (findVisualChange(targetItem) == null) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + return true; + } + } + break; + } + } + + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (_weaponType != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) + { + if (_weaponType != WeaponType.CROSSBOW) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + } + + switch (_handType) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + } + + switch (_magicType) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + if (_armorType != ArmorType.NONE) + { + switch (_armorType) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + return true; + } + + public AppearanceHolder findVisualChange(Item targetItem) + { + for (AppearanceHolder holder : _allVisualIds) + { + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + { + continue; + } + + if (holder.getWeaponType() != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) + { + if (holder.getWeaponType() != WeaponType.CROSSBOW) + { + continue; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + continue; + } + } + + switch (holder.getHandType()) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + continue; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + continue; + } + break; + } + } + + switch (holder.getMagicType()) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + continue; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + continue; + } + } + } + } + + if (holder.getArmorType() != ArmorType.NONE) + { + switch (holder.getArmorType()) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + continue; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + continue; + } + } + } + } + return holder; + } + return null; + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java new file mode 100644 index 0000000000..6f73983c0e --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -0,0 +1,65 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import java.util.EnumMap; +import java.util.Map; + +import org.l2jmobius.gameserver.model.StatSet; + +/** + * @author UnAfraid + */ +public class CombinationItem +{ + private final int _itemOne; + private final int _itemTwo; + private final int _chance; + private final Map _rewards = new EnumMap<>(CombinationItemType.class); + + public CombinationItem(StatSet set) + { + _itemOne = set.getInt("one"); + _itemTwo = set.getInt("two"); + _chance = set.getInt("chance"); + } + + public int getItemOne() + { + return _itemOne; + } + + public int getItemTwo() + { + return _itemTwo; + } + + public int getChance() + { + return _chance; + } + + public void addReward(CombinationItemReward item) + { + _rewards.put(item.getType(), item); + } + + public CombinationItemReward getReward(CombinationItemType type) + { + return _rewards.get(type); + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java similarity index 90% rename from L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java rename to L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 1e78189ef3..9cd198708e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..1099b77054 --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private long _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(long slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 93% rename from L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index 59f82cf9a4..d12e0b3ac9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.stats.Stat; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java new file mode 100644 index 0000000000..bfe1c295da --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -0,0 +1,57 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public class EnchantSupportItem extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isGiant; + private final ItemType type; + + public EnchantSupportItem(StatSet set) + { + super(set); + type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + public boolean isBlessed() + { + return _isBlessed; + } + + public boolean isGiant() + { + return _isGiant; + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 0cb1e2777f..3a7e3c1832 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -72,15 +72,15 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java new file mode 100644 index 0000000000..c8a309674f --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -0,0 +1,88 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Crystal Type enumerated. + * @author Adry_85 + */ +public enum CrystalType +{ + NONE(0, 0, 0, 0), + D(1, 1458, 11, 90), + C(2, 1459, 6, 45), + B(3, 1460, 11, 67), + A(4, 1461, 20, 145), + S(5, 1462, 25, 250), + S80(6, 1462, 25, 250), + S84(7, 1462, 25, 250), + R(8, 17371, 30, 500), + R95(9, 17371, 30, 500), + R99(10, 17371, 30, 500), + EVENT(11, 0, 0, 0); + + private final int _level; + private final int _crystalId; + private final int _crystalEnchantBonusArmor; + private final int _crystalEnchantBonusWeapon; + + CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) + { + _level = level; + _crystalId = crystalId; + _crystalEnchantBonusArmor = crystalEnchantBonusArmor; + _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; + } + + /** + * Gets the crystal type ID. + * @return the crystal type ID + */ + public int getLevel() + { + return _level; + } + + /** + * Gets the item ID of the crystal. + * @return the item ID of the crystal + */ + public int getCrystalId() + { + return _crystalId; + } + + public int getCrystalEnchantBonusArmor() + { + return _crystalEnchantBonusArmor; + } + + public int getCrystalEnchantBonusWeapon() + { + return _crystalEnchantBonusWeapon; + } + + public boolean isGreater(CrystalType crystalType) + { + return getLevel() > crystalType.getLevel(); + } + + public boolean isLesser(CrystalType crystalType) + { + return getLevel() < crystalType.getLevel(); + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 93% rename from L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index 3b20f4604e..a2f75ae00c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * EtcItem Type enumerated. diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java new file mode 100644 index 0000000000..fdaf0dbe8d --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +import org.l2jmobius.gameserver.model.stats.TraitType; + +/** + * Weapon Type enumerated. + * @author mkizub + */ +public enum WeaponType implements ItemType +{ + NONE(TraitType.NONE), + SWORD(TraitType.SWORD), + BLUNT(TraitType.BLUNT), + DAGGER(TraitType.DAGGER), + POLE(TraitType.POLE), + DUALFIST(TraitType.DUALFIST), + BOW(TraitType.BOW), + ETC(TraitType.ETC), + DUAL(TraitType.DUAL), + FIST(TraitType.FIST), // 0 items with that type + FISHINGROD(TraitType.NONE), + RAPIER(TraitType.RAPIER), + CROSSBOW(TraitType.CROSSBOW), + ANCIENTSWORD(TraitType.ANCIENTSWORD), + FLAG(TraitType.NONE), // 0 items with that type + DUALDAGGER(TraitType.DUALDAGGER), + OWNTHING(TraitType.NONE), // 0 items with that type + TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), + DUALBLUNT(TraitType.DUALBLUNT); + + private final int _mask; + private final TraitType _traitType; + + /** + * Constructor of the WeaponType. + * @param traitType + */ + WeaponType(TraitType traitType) + { + _mask = 1 << ordinal(); + _traitType = traitType; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int mask() + { + return _mask; + } + + /** + * @return TraitType the type of the WeaponType + */ + public TraitType getTraitType() + { + return _traitType; + } + + public boolean isRanged() + { + return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isCrossbow() + { + return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); + } + + public boolean isDual() + { + return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); + } +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 7f7ae8087c..d51a9b03d2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index c8eba27770..f63a9f8aa4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -54,13 +54,13 @@ import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index e78f33f533..3ccafd611f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -22,8 +22,8 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 512ef18689..0a83925e3c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,10 +40,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRandomCraft.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRandomCraft.java index b95eaabe63..7dea6f5049 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRandomCraft.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRandomCraft.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.data.xml.RandomCraftData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RandomCraftRequest; import org.l2jmobius.gameserver.model.holders.RandomCraftRewardItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExItemAnnounce; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Henna.java deleted file mode 100644 index 09fdb7abcb..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Henna.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.l2jmobius.gameserver.enums.ClassId; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; - -/** - * Class for the Henna object. - * @author Zoey76 - */ -public class Henna -{ - private final int _dyeId; - private final int _dyeItemId; - private final Map _baseStats = new HashMap<>(); - private final int _wearFee; - private final int _wearCount; - private final int _cancelFee; - private final int _cancelCount; - private final int _duration; - private final List _skills; - private final List _wearClass; - - public Henna(StatSet set) - { - _dyeId = set.getInt("dyeId"); - _dyeItemId = set.getInt("dyeItemId"); - _baseStats.put(BaseStat.STR, set.getInt("str", 0)); - _baseStats.put(BaseStat.CON, set.getInt("con", 0)); - _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); - _baseStats.put(BaseStat.INT, set.getInt("int", 0)); - _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); - _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _wearFee = set.getInt("wear_fee"); - _wearCount = set.getInt("wear_count"); - _cancelFee = set.getInt("cancel_fee"); - _cancelCount = set.getInt("cancel_count"); - _duration = set.getInt("duration", -1); - _skills = new ArrayList<>(); - _wearClass = new ArrayList<>(); - } - - /** - * @return the dye Id. - */ - public int getDyeId() - { - return _dyeId; - } - - /** - * @return the item Id, required for this dye. - */ - public int getDyeItemId() - { - return _dyeItemId; - } - - public int getBaseStats(BaseStat stat) - { - return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); - } - - public Map getBaseStats() - { - return _baseStats; - } - - /** - * @return the wear fee, cost for adding this dye to the player. - */ - public int getWearFee() - { - return _wearFee; - } - - /** - * @return the wear count, the required count to add this dye to the player. - */ - public int getWearCount() - { - return _wearCount; - } - - /** - * @return the cancel fee, cost for removing this dye from the player. - */ - public int getCancelFee() - { - return _cancelFee; - } - - /** - * @return the cancel count, the retrieved amount of dye items after removing the dye. - */ - public int getCancelCount() - { - return _cancelCount; - } - - /** - * @return the duration of this dye. - */ - public int getDuration() - { - return _duration; - } - - /** - * @param skillList the list of skills related to this dye. - */ - public void setSkills(List skillList) - { - _skills.addAll(skillList); - } - - /** - * @return the skills related to this dye. - */ - public List getSkills() - { - return _skills; - } - - /** - * @return the list with the allowed classes to wear this dye. - */ - public List getAllowedWearClass() - { - return _wearClass; - } - - /** - * @param classId the class trying to wear this dye. - * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. - */ - public boolean isAllowedClass(ClassId classId) - { - return _wearClass.contains(classId); - } - - /** - * @param wearClassIds the list of classes that can wear this dye. - */ - public void setWearClassIds(List wearClassIds) - { - _wearClass.addAll(wearClassIds); - } -} \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Weapon.java deleted file mode 100644 index 832169f5f1..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is dedicated to the management of weapons. - */ -public class Weapon extends ItemTemplate -{ - private WeaponType _type; - private boolean _isMagicWeapon; - private int _soulShotCount; - private int _spiritShotCount; - private int _mpConsume; - private int _baseAttackRange; - private int _baseAttackRadius; - private int _baseAttackAngle; - private int _changeWeaponId; - - private int _reducedSoulshot; - private int _reducedSoulshotChance; - - private int _reducedMpConsume; - private int _reducedMpConsumeChance; - - private boolean _isForceEquip; - private boolean _isAttackWeapon; - private boolean _useWeaponSkillsOnly; - - /** - * Constructor for Weapon. - * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. - */ - public Weapon(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_WEAPON; - _isMagicWeapon = set.getBoolean("is_magic_weapon", false); - _soulShotCount = set.getInt("soulshots", 0); - _spiritShotCount = set.getInt("spiritshots", 0); - _mpConsume = set.getInt("mp_consume", 0); - _baseAttackRange = set.getInt("attack_range", 40); - final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) - { - _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); - } - else - { - _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 - } - - final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); - _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; - _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; - - final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); - _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; - _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; - _changeWeaponId = set.getInt("change_weaponId", 0); - _isForceEquip = set.getBoolean("isForceEquip", false); - _isAttackWeapon = set.getBoolean("isAttackWeapon", true); - _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); - } - - /** - * @return the type of Weapon - */ - @Override - public WeaponType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - @Override - public boolean isWeapon() - { - return true; - } - - /** - * @return {@code true} if the weapon is magic, {@code false} otherwise. - */ - @Override - public boolean isMagicWeapon() - { - return _isMagicWeapon; - } - - /** - * @return the quantity of SoulShot used. - */ - public int getSoulShotCount() - { - return _soulShotCount; - } - - /** - * @return the quantity of SpiritShot used. - */ - public int getSpiritShotCount() - { - return _spiritShotCount; - } - - /** - * @return the reduced quantity of SoultShot used. - */ - public int getReducedSoulShot() - { - return _reducedSoulshot; - } - - /** - * @return the chance to use Reduced SoultShot. - */ - public int getReducedSoulShotChance() - { - return _reducedSoulshotChance; - } - - /** - * @return the MP consumption with the weapon. - */ - public int getMpConsume() - { - return _mpConsume; - } - - public int getBaseAttackRange() - { - return _baseAttackRange; - } - - public int getBaseAttackRadius() - { - return _baseAttackRadius; - } - - public int getBaseAttackAngle() - { - return _baseAttackAngle; - } - - /** - * @return the reduced MP consumption with the weapon. - */ - public int getReducedMpConsume() - { - return _reducedMpConsume; - } - - /** - * @return the chance to use getReducedMpConsume() - */ - public int getReducedMpConsumeChance() - { - return _reducedMpConsumeChance; - } - - /** - * @return the Id in which weapon this weapon can be changed. - */ - public int getChangeWeaponId() - { - return _changeWeaponId; - } - - /** - * @return {@code true} if the weapon is force equip, {@code false} otherwise. - */ - public boolean isForceEquip() - { - return _isForceEquip; - } - - /** - * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. - */ - public boolean isAttackWeapon() - { - return _isAttackWeapon; - } - - /** - * @return {@code true} if the weapon is skills only, {@code false} otherwise. - */ - public boolean useWeaponSkillsOnly() - { - return _useWeaponSkillsOnly; - } - - /** - * @param caster the Creature pointing out the caster - * @param target the Creature pointing out the target - * @param trigger - * @param type - */ - public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) - { - forEachSkill(type, holder -> - { - final Skill skill = holder.getSkill(); - if (Rnd.get(100) >= holder.getChance()) - { - return; - } - - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // Trigger only if both are good or bad magic. - if (trigger.isBad() != skill.isBad()) - { - return; - } - - // No Trigger if not Magic Skill or is toggle - if (trigger.isMagic() != skill.isMagic()) - { - return; - } - - // No Trigger if skill is toggle - if (trigger.isToggle()) - { - return; - } - - if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) - { - return; - } - } - - // Skill condition not met - if (!skill.checkCondition(caster, target, true)) - { - return; - } - - skill.activateSkill(caster, target); - - // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // notify quests of a skill use - if (caster.isPlayer()) - { - World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); - } - if (caster.isPlayer()) - { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); - sm.addSkillName(skill); - caster.sendPacket(sm); - } - } - }); - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java deleted file mode 100644 index a568389489..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ /dev/null @@ -1,558 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author UnAfraid - */ -public class AppearanceStone -{ - private final int _id; - private final int _cost; - private final int _visualId; - private final long _lifeTime; - private final AppearanceType _type; - private final WeaponType _weaponType; - private final ArmorType _armorType; - private final AppearanceHandType _handType; - private final AppearanceMagicType _magicType; - private List _crystalTypes; - private List _targetTypes; - private List _bodyParts; - private List _races; - private List _racesNot; - private List _allVisualIds; - - public AppearanceStone(StatSet set) - { - _id = set.getInt("id"); - _visualId = set.getInt("visualId", 0); - _cost = set.getInt("cost", 0); - _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); - _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); - _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); - _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); - _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); - _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); - - final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); - if (targetType != AppearanceTargetType.NONE) - { - addTargetType(targetType); - } - - // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. - final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); - - // If no crystal type is defined, we must add all defaults. - if (crystalType == null) - { - switch (targetType) - { - case ACCESSORY: - case ALL: - { - addCrystalType(CrystalType.NONE); - // fallthrough - } - case WEAPON: - case ARMOR: - { - for (CrystalType cryType : CrystalType.values()) - { - if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) - { - addCrystalType(cryType); - } - } - } - } - } - else - { - addCrystalType(crystalType); - } - - final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); - if (bodyPart != ItemTemplate.SLOT_NONE) - { - addBodyPart(bodyPart); - } - - final Race race = set.getEnum("race", Race.class, Race.NONE); - if (race != Race.NONE) - { - addRace(race); - } - - final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); - if (raceNot != Race.NONE) - { - addRaceNot(raceNot); - } - } - - public int getId() - { - return _id; - } - - public int getVisualId() - { - return _visualId; - } - - public int getCost() - { - return _cost; - } - - public long getLifeTime() - { - return _lifeTime; - } - - public AppearanceType getType() - { - return _type; - } - - public WeaponType getWeaponType() - { - return _weaponType; - } - - public ArmorType getArmorType() - { - return _armorType; - } - - public AppearanceHandType getHandType() - { - return _handType; - } - - public AppearanceMagicType getMagicType() - { - return _magicType; - } - - public void addCrystalType(CrystalType type) - { - if (_crystalTypes == null) - { - _crystalTypes = new ArrayList<>(); - } - _crystalTypes.add(type); - } - - public List getCrystalTypes() - { - return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); - } - - public void addTargetType(AppearanceTargetType type) - { - if (_targetTypes == null) - { - _targetTypes = new ArrayList<>(); - } - _targetTypes.add(type); - } - - public List getTargetTypes() - { - return _targetTypes != null ? _targetTypes : Collections.emptyList(); - } - - public void addBodyPart(long part) - { - if (_bodyParts == null) - { - _bodyParts = new ArrayList<>(); - } - _bodyParts.add(part); - } - - public void addVisualId(AppearanceHolder appearanceHolder) - { - if (_allVisualIds == null) - { - _allVisualIds = new ArrayList<>(); - } - _allVisualIds.add(appearanceHolder); - } - - public List getVisualIds() - { - return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); - } - - public List getBodyParts() - { - return _bodyParts != null ? _bodyParts : Collections.emptyList(); - } - - public void addRace(Race race) - { - if (_races == null) - { - _races = new ArrayList<>(); - } - _races.add(race); - } - - public List getRaces() - { - return _races != null ? _races : Collections.emptyList(); - } - - public void addRaceNot(Race race) - { - if (_racesNot == null) - { - _racesNot = new ArrayList<>(); - } - _racesNot.add(race); - } - - public List getRacesNot() - { - return _racesNot != null ? _racesNot : Collections.emptyList(); - } - - /** - * @param player the actor requesting to use this appearance. - * @param targetItem the item to be modified with this appearance. - * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. - */ - public boolean checkConditions(Player player, Item targetItem) - { - if (targetItem == null) - { - return false; - } - - if (getTargetTypes().isEmpty()) - { - return false; - } - - if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); - return false; - } - - switch (_type) - { - case RESTORE: - { - if (targetItem.getVisualId() == 0) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); - return false; - } - - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - default: - { - // Seems like in retail item with already changed appearance, can be changed again without being restored. - - final AppearanceTargetType targetType = getTargetTypes().get(0); - switch (targetType) - { - case NONE: - { - return false; - } - case WEAPON: - { - if (!targetItem.isWeapon()) - { - player.sendPacket(SystemMessageId.WEAPONS_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ARMOR: - { - if (!targetItem.isArmor()) - { - player.sendPacket(SystemMessageId.ARMOR_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ACCESSORY: - { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) - { - player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); - return false; - } - break; - } - case ALL: - { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (findVisualChange(targetItem) == null) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - return true; - } - } - break; - } - } - - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (_weaponType != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) - { - if (_weaponType != WeaponType.CROSSBOW) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - } - - switch (_handType) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - } - - switch (_magicType) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - if (_armorType != ArmorType.NONE) - { - switch (_armorType) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - return true; - } - - public AppearanceHolder findVisualChange(Item targetItem) - { - for (AppearanceHolder holder : _allVisualIds) - { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) - { - continue; - } - - if (holder.getWeaponType() != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) - { - if (holder.getWeaponType() != WeaponType.CROSSBOW) - { - continue; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - continue; - } - } - - switch (holder.getHandType()) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - continue; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - continue; - } - break; - } - } - - switch (holder.getMagicType()) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - continue; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - continue; - } - } - } - } - - if (holder.getArmorType() != ArmorType.NONE) - { - switch (holder.getArmorType()) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - continue; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - continue; - } - } - } - } - return holder; - } - return null; - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java deleted file mode 100644 index a2897ba911..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import java.util.EnumMap; -import java.util.Map; - -import org.l2jmobius.gameserver.model.StatSet; - -/** - * @author UnAfraid - */ -public class CombinationItem -{ - private final int _itemOne; - private final int _itemTwo; - private final int _chance; - private final Map _rewards = new EnumMap<>(CombinationItemType.class); - - public CombinationItem(StatSet set) - { - _itemOne = set.getInt("one"); - _itemTwo = set.getInt("two"); - _chance = set.getInt("chance"); - } - - public int getItemOne() - { - return _itemOne; - } - - public int getItemTwo() - { - return _itemTwo; - } - - public int getChance() - { - return _chance; - } - - public void addReward(CombinationItemReward item) - { - _rewards.put(item.getType(), item); - } - - public CombinationItemReward getReward(CombinationItemType type) - { - return _rewards.get(type); - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fe698d8e2a..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private long _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(long slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java deleted file mode 100644 index 13d6b5a2ee..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public class EnchantSupportItem extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isGiant; - private final ItemType type; - - public EnchantSupportItem(StatSet set) - { - super(set); - type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - public boolean isBlessed() - { - return _isBlessed; - } - - public boolean isGiant() - { - return _isGiant; - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java deleted file mode 100644 index d059efd025..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Crystal Type enumerated. - * @author Adry_85 - */ -public enum CrystalType -{ - NONE(0, 0, 0, 0), - D(1, 1458, 11, 90), - C(2, 1459, 6, 45), - B(3, 1460, 11, 67), - A(4, 1461, 20, 145), - S(5, 1462, 25, 250), - S80(6, 1462, 25, 250), - S84(7, 1462, 25, 250), - R(8, 17371, 30, 500), - R95(9, 17371, 30, 500), - R99(10, 17371, 30, 500), - EVENT(11, 0, 0, 0); - - private final int _level; - private final int _crystalId; - private final int _crystalEnchantBonusArmor; - private final int _crystalEnchantBonusWeapon; - - CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) - { - _level = level; - _crystalId = crystalId; - _crystalEnchantBonusArmor = crystalEnchantBonusArmor; - _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; - } - - /** - * Gets the crystal type ID. - * @return the crystal type ID - */ - public int getLevel() - { - return _level; - } - - /** - * Gets the item ID of the crystal. - * @return the item ID of the crystal - */ - public int getCrystalId() - { - return _crystalId; - } - - public int getCrystalEnchantBonusArmor() - { - return _crystalEnchantBonusArmor; - } - - public int getCrystalEnchantBonusWeapon() - { - return _crystalEnchantBonusWeapon; - } - - public boolean isGreater(CrystalType crystalType) - { - return getLevel() > crystalType.getLevel(); - } - - public boolean isLesser(CrystalType crystalType) - { - return getLevel() < crystalType.getLevel(); - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java deleted file mode 100644 index f50a13d010..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -import org.l2jmobius.gameserver.model.stats.TraitType; - -/** - * Weapon Type enumerated. - * @author mkizub - */ -public enum WeaponType implements ItemType -{ - NONE(TraitType.NONE), - SWORD(TraitType.SWORD), - BLUNT(TraitType.BLUNT), - DAGGER(TraitType.DAGGER), - POLE(TraitType.POLE), - DUALFIST(TraitType.DUALFIST), - BOW(TraitType.BOW), - ETC(TraitType.ETC), - DUAL(TraitType.DUAL), - FIST(TraitType.FIST), // 0 items with that type - FISHINGROD(TraitType.NONE), - RAPIER(TraitType.RAPIER), - CROSSBOW(TraitType.CROSSBOW), - ANCIENTSWORD(TraitType.ANCIENTSWORD), - FLAG(TraitType.NONE), // 0 items with that type - DUALDAGGER(TraitType.DUALDAGGER), - OWNTHING(TraitType.NONE), // 0 items with that type - TWOHANDCROSSBOW(TraitType.TWOHANDCROSSBOW), - DUALBLUNT(TraitType.DUALBLUNT); - - private final int _mask; - private final TraitType _traitType; - - /** - * Constructor of the WeaponType. - * @param traitType - */ - WeaponType(TraitType traitType) - { - _mask = 1 << ordinal(); - _traitType = traitType; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int mask() - { - return _mask; - } - - /** - * @return TraitType the type of the WeaponType - */ - public TraitType getTraitType() - { - return _traitType; - } - - public boolean isRanged() - { - return (this == BOW) || (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isCrossbow() - { - return (this == CROSSBOW) || (this == TWOHANDCROSSBOW); - } - - public boolean isDual() - { - return (this == DUALFIST) || (this == DUAL) || (this == DUALDAGGER) || (this == DUALBLUNT); - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 5f818e731e..2ec9bd8f69 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 17c83523b7..44a87d7c08 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/Quest.java index c5d11839a5..3f3ec696ae 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/Skill.java index 4f8839c353..d777746032 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index bbba3742ef..2055a805bb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -58,10 +58,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 54907880aa..63f20c77b2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -39,11 +39,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 45d32295d2..463ea798f0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 577ca267e7..65b445397e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index f4bf542a6d..05d0c728ec 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 38a7116383..ff0ad75b8a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index c1cac0d20a..02c4f00cf6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 1839afb5ce..334fb9252a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 7109a54ed1..5df6b208a3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index 165f9b4668..80e30184ff 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index df3acc3df1..7c51b0ad38 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index bab0af38a8..1c31ff4a11 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 3c8e441156..8548ad1d3a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index cfb6455ad0..31d29ef3dd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 6308e152f1..5cc0088afb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6a1349411b..8aa6eceef4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -52,10 +52,10 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 4f024118f8..cf3ea246f2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 7c2ffd3381..04cf0eb4aa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 8e4db9d92c..a7e3f28ed6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 85615c57e3..e87b17fa93 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1108bbf2dd..751e6d4a4f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 4187b31783..fe9f7b3d25 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,8 +31,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 6cc03e2c2b..48cdb8e80b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 34040f8965..78f3a6afb7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 597a5909f8..f7ce118e6f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 1ee3ae0cfc..5351c0c1de 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index e8f653a83c..a4e3d49ec4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index 9ffbf47431..ae0b70c5bc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index ce98ab493d..d0add3fa49 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 595da81538..ab9f0c33f7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 945ff531e4..b9c3900403 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 18485fdbd4..4d3adf25dc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 73c558df37..57a20af6c4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 8ac47eea12..5364e67986 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index cb16d5cc7d..cd8e900014 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 3e06fab27a..47ce1532d4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index ff56c5b0a4..88a9e1c787 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 61920f471b..f89be1cfcb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 8a2a0b5033..1b5eb14605 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 17fa6aeaf2..f02aaa9ace 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 6bcf906d49..f74fcd67b2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -38,10 +38,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 81e3a8f4c9..7e89bd6ed3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java index cf6407ac6a..f02b7db6aa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.ShortCuts; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java index 638f112b96..53b9261ab5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.BlessingItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java index de23bc4732..86e007d9ce 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.blessing; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index 549c7bed70..670f9a29ed 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 73760d9e28..3b6cd21f20 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index e7a8e8baf6..7fbd7ebecb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 43960b870a..8bb6a1605c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 1382713f2f..beca532961 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index fc38b11104..ccce24215e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 25c9792ec1..3220827fbb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java index bfd5d57db5..ee5529bf35 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.PrimeShopRequest; import org.l2jmobius.gameserver.model.holders.LimitShopProductHolder; import org.l2jmobius.gameserver.model.holders.LimitShopRandomCraftReward; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.AccountVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index a4f0ecaefb..d5690408da 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java index deb54b2612..f10148af7e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java @@ -15,7 +15,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java index c9a4bc2a29..4bd0543f06 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java @@ -11,8 +11,8 @@ import org.l2jmobius.gameserver.ai.NextAction; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java index f264888149..aa8e58c146 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java @@ -7,8 +7,8 @@ import org.l2jmobius.gameserver.ai.NextAction; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java index 94aaa87554..fee0b270a5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java index 7ba2990cf4..13512321f5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java index aad73b105e..081a29e9cd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java index 6feb078651..a3e449b1cc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java index 7d885e7bc8..7b6bf5b6c3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.RandomCraftData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RandomCraftRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.randomcraft.ExCraftExtract; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java index a98c74a7c7..7a3aad8282 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets.randomcraft; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRandomCraft; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.randomcraft.ExCraftRandomInfo; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51cd76618e..af8b12547e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 84da450597..c1843be93c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 61fd93e55c..6063a54535 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index 5a7a9c9c3b..a0ba15da9f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.holders.DamageTakenHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 43fa6faeb8..6f00d41989 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 93588924fe..077f33cb49 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 07725028a6..76375a86f7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c9e5eabc7..ef1d37297e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index e4fb9e4160..b65005003d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 51abfa9d3e..f49138fafe 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 4bd0a38bda..7e0614b359 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 6d0df16c27..0e6e64c7b2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 61a01d067c..658087380a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 84bc5a6eba..3800940bac 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index b79342c0a8..3a780986a0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index bd768c74e2..c4598a72e6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index c94eae4c08..00d7618d34 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ced39204d3..fbb5c84dfe 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4068629bde..d05590cbde 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 0e6211e63b..358ee2361b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 0dc656cef6..2d352ea5cd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c742d534c4..c59568bf1d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index a22b36335e..35ca986d35 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 271ec4401b..37150ec357 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 6b8cd1358f..c32d4f7c04 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java index 807bb18802..f45d3262ac 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractInventoryUpdate; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java index 92ad2b6fc1..cd0744b2c4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.pet; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java index d4e38ef328..a66350d83b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.network.serverpackets.vip; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index fceabef738..e60ad5658f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro; /** diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 7553a3233e..fb0db44e8e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Guard; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/DocumentBase.java index cebed94cd2..a2f01e4fae 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -47,6 +47,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -135,9 +138,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java index 2ee34992de..f3f586bddb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPremiumManagerShowHtml; import org.l2jmobius.gameserver.network.serverpackets.ExShowVariationCancelWindow; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/SiegeGuards.java index 8ac4fe72af..c9ca7df743 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index fa45b28c67..42d382f269 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index dd4215411e..a8e6c06eed 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 7c2572fa42..14325a32cf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 5b1db54836..e7113941ec 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index f73f3c2e73..5d3caadfd5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index dcff53c86d..98919a85ec 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 978b338c06..d2a939b605 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index ef698d3144..98c614b7e5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index e1681d19a4..8e1d2e4ebd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 4e5a8d7aaf..1950403a0d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index 1d104a4069..bb6ed54b11 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 6e043ac66c..f5c8d5972d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index e52e649f3c..d7a25309f2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 437b502a95..b8985f0fef 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 025ceedd06..613bba57ff 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index 1866a34d94..b7c74b3b74 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 7f55fdc9ed..7e0edf65b8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 1712fe6e34..da6af99db9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 28b0f453fc..5c2f25e7f2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveHonorCoins.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveHonorCoins.java index c3a6ea1a0b..1c988aba4f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveHonorCoins.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveHonorCoins.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 2ed9c1c346..7f5e0e87a1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index ebbd33bda0..f952b58fa2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 94958b7956..bd1cbe6e09 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 3f5e92bb2e..65bd99edef 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 1bb129993f..3cfcc73e45 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Hp.java index ceb2e22058..6d6bc006aa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index f0dcef68c8..a503aab636 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 02468039cf..742f98e38b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index 8bbb0e59a5..b995cc61c1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyCraftPoints.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyCraftPoints.java index 49518c6b1d..ba3a1ceb95 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyCraftPoints.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyCraftPoints.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyDeathPoints.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyDeathPoints.java index c9435e06a8..1a18c4d1e2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyDeathPoints.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyDeathPoints.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyMagicLampPoints.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyMagicLampPoints.java index 118dd8ac0c..fe8710dea5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyMagicLampPoints.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyMagicLampPoints.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 742ca00283..3d97c9ac22 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 3eb4d77710..8b4d315b50 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 658563aca3..6d5cc2cb9b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 533e839854..39b2180787 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index aaa9641567..721bf8ce08 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index b2c24db4d9..c1996baf44 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 9b000811ff..382c248297 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java index 326bd6a9cc..ae8351148e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 090580340e..8df6b0b267 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index d65939613a..87dec4a24c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b4ea6e761f..bfc5324c4d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index b3a566f95c..147c88b3c8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetEvolveHolder; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 83860039e2..a22aaf477d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java index 8c1be275c7..200a0cc1fd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/VipUp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/VipUp.java index 9cf1267bbb..f716953da2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/VipUp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/VipUp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 96033d321b..5f0a327962 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java index ad487044b9..db8516fac9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ElementalSpirit; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index ecb73b365e..30e5fd51af 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 47b2418ab8..ab876ab449 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index ba621c653f..f553a0c846 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 9b16668969..119fe1f81e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BlessingScrolls.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BlessingScrolls.java index e2ba792dd5..2d475bb669 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BlessingScrolls.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/BlessingScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.BlessingItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.blessing.ExOpenBlessOptionScroll; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index 2ce753368d..c823bbe457 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index d7008524ad..6ed099eccf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 4cebf9c999..9731abbc15 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 899b682c18..bc5244b878 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 5c0399e986..1e3613fc0c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java index a64172c3dc..40cb212cfd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 70ca58da2a..105834d461 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 05a3885973..461e78bb8b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index c6d8ec7a1b..1f44066740 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 98ae8c4eaf..353347df87 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index 3988e77104..587f809dc9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 77b9a03185..c0d47bc8de 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java index 92d83111cd..bf2ecd6938 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java @@ -19,7 +19,7 @@ package quests.Q10971_TalismanEnchant; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java index fd5898fa51..ac11b50139 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java @@ -18,7 +18,7 @@ package quests.Q10973_EnchantingAgathions; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java index 71aa6530b4..7ab80fefd9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java @@ -19,7 +19,7 @@ package quests.Q10974_NewStylishEquipment; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/CreatureAI.java index bb78cafa1c..670e0a7192 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/ItemTable.java index be8e8b5cfc..12235d6604 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -48,12 +48,12 @@ import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.AmmunitionSkillList; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index a9849da481..294321be58 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.PetEvolveHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index 313709ab07..4b2cf3b555 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 0f8815bcc4..475f0085d8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index d134fe859e..c57e62c683 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/CollectionData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/CollectionData.java index 40504de824..baf3bcf2b8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/CollectionData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/CollectionData.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.CollectionDataHolder; import org.l2jmobius.gameserver.model.holders.ItemCollectionData; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Written by Berezkin Nikolay, on 04.05.2021 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index 1966613539..294a8b45f6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java index 624a8754f5..9644699cc0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.LimitShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius, GustavoFonseca diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java index 11000be2bb..826ff206e4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.LimitShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/RandomCraftData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/RandomCraftData.java index 57122b712d..2914ecf635 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/RandomCraftData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/RandomCraftData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.RandomCraftExtractDataHolder; import org.l2jmobius.gameserver.model.holders.RandomCraftRewardDataHolder; import org.l2jmobius.gameserver.model.holders.RandomCraftRewardItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mode, Mobius diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 0cb9fed9fa..e07f7d9f64 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/VariationData.java index 392612cd2d..c29a10baa2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index 1b5d73308d..4ed0600683 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 179b4467c3..2ce3e815cc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 4dcb5c4bf9..b5a0a94918 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 11220499cf..d5b8557f68 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -35,9 +35,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index ce03808800..7799768d15 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ArmorSet.java index 2a57f20a10..6b504526ef 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CombatFlag.java index e726f912f1..e0487f9079 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 141e0af973..94118c482b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ItemInfo.java index d96a043814..6787a5376b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.PetEvolveHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Party.java index ba7db00a30..8d9082211b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Party.java @@ -46,8 +46,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ShortCuts.java index d199976edc..a9fd529ecc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TradeItem.java index 2fee1b22b4..adc501d705 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TradeList.java index bbafcb1416..bea714862c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 1b67e36b38..e3fa12532b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -67,8 +67,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java index b22cd5cc10..1693edd262 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -116,12 +116,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java index a4e8e31909..53789c66e4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -75,8 +75,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java index f7555fc73a..7df8c2c1ac 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -249,6 +249,15 @@ import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; @@ -256,15 +265,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRandomCraft; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java index 7d7f9e8ea0..2e33c6270e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index c6c08e5893..2f789753be 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -62,11 +62,11 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.PetEvolveHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index a30daaaa95..66d6c903e4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index 5cab0f8c31..80b209f216 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index ebce1675a6..2367cbb941 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index fdba2945a9..6f5734a1d7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 6e4bcf98c1..a191dfbab5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SubClassHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 29208b2b65..8e5328b099 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index a909041435..d9b47053dc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -40,8 +40,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9f908898ea..ebdbe02899 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index d60e1343b9..1f55ed1bae 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 2e75866e00..0b472089a8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index fcd8e14da5..2613a1847b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index b778a112b9..e6ea3ab07d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index fc9320c7a7..5ccfc2ab1d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.SoulType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index a5fea7c6f6..347f281026 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index ea0cef1aee..9fa5d2bdad 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -130,15 +130,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index e202b08913..3e94350ad8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 79c69f739d..41f554b9e0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index b86121305d..b18ff0fce9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Armor.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Armor.java new file mode 100644 index 0000000000..f65945c191 --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -0,0 +1,92 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.ArmorType; + +/** + * This class is dedicated to the management of armors. + */ +public class Armor extends ItemTemplate +{ + private ArmorType _type; + + /** + * Constructor for Armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. + */ + public Armor(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); + + final long bodyPart = getBodyPart(); + if ((bodyPart == ItemTemplate.SLOT_ARTIFACT) || (bodyPart == ItemTemplate.SLOT_AGATHION)) + { + _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; + _type2 = ItemTemplate.TYPE2_ACCESSORY; + } + else if ((bodyPart == ItemTemplate.SLOT_NECK) || ((bodyPart & ItemTemplate.SLOT_L_EAR) != 0) || ((bodyPart & ItemTemplate.SLOT_L_FINGER) != 0) || ((bodyPart & ItemTemplate.SLOT_R_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_L_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_ARTIFACT_BOOK) != 0)) + { + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_ACCESSORY; + } + else + { + if ((_type == ArmorType.NONE) && (getBodyPart() == ItemTemplate.SLOT_L_HAND)) + { + _type = ArmorType.SHIELD; + } + _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; + _type2 = ItemTemplate.TYPE2_SHIELD_ARMOR; + } + } + + /** + * @return the type of the armor. + */ + @Override + public ArmorType getItemType() + { + return _type; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise + */ + @Override + public boolean isArmor() + { + return true; + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Henna.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Henna.java new file mode 100644 index 0000000000..d029309b0f --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -0,0 +1,171 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; + +/** + * Class for the Henna object. + * @author Zoey76 + */ +public class Henna +{ + private final int _dyeId; + private final int _dyeItemId; + private final Map _baseStats = new HashMap<>(); + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final int _duration; + private final List _skills; + private final List _wearClass; + + public Henna(StatSet set) + { + _dyeId = set.getInt("dyeId"); + _dyeItemId = set.getInt("dyeItemId"); + _baseStats.put(BaseStat.STR, set.getInt("str", 0)); + _baseStats.put(BaseStat.CON, set.getInt("con", 0)); + _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); + _baseStats.put(BaseStat.INT, set.getInt("int", 0)); + _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); + _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _duration = set.getInt("duration", -1); + _skills = new ArrayList<>(); + _wearClass = new ArrayList<>(); + } + + /** + * @return the dye Id. + */ + public int getDyeId() + { + return _dyeId; + } + + /** + * @return the item Id, required for this dye. + */ + public int getDyeItemId() + { + return _dyeItemId; + } + + public int getBaseStats(BaseStat stat) + { + return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); + } + + public Map getBaseStats() + { + return _baseStats; + } + + /** + * @return the wear fee, cost for adding this dye to the player. + */ + public int getWearFee() + { + return _wearFee; + } + + /** + * @return the wear count, the required count to add this dye to the player. + */ + public int getWearCount() + { + return _wearCount; + } + + /** + * @return the cancel fee, cost for removing this dye from the player. + */ + public int getCancelFee() + { + return _cancelFee; + } + + /** + * @return the cancel count, the retrieved amount of dye items after removing the dye. + */ + public int getCancelCount() + { + return _cancelCount; + } + + /** + * @return the duration of this dye. + */ + public int getDuration() + { + return _duration; + } + + /** + * @param skillList the list of skills related to this dye. + */ + public void setSkills(List skillList) + { + _skills.addAll(skillList); + } + + /** + * @return the skills related to this dye. + */ + public List getSkills() + { + return _skills; + } + + /** + * @return the list with the allowed classes to wear this dye. + */ + public List getAllowedWearClass() + { + return _wearClass; + } + + /** + * @param classId the class trying to wear this dye. + * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. + */ + public boolean isAllowedClass(ClassId classId) + { + return _wearClass.contains(classId); + } + + /** + * @param wearClassIds the list of classes that can wear this dye. + */ + public void setWearClassIds(List wearClassIds) + { + _wearClass.addAll(wearClassIds); + } +} \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index 56b14ad5c7..76131b3078 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 91% rename from L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index 5b9babb699..909b5453b2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.Collection; import java.util.Objects; @@ -22,9 +22,9 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Weapon.java new file mode 100644 index 0000000000..4599d5047f --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -0,0 +1,311 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.enums.ItemSkillType; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is dedicated to the management of weapons. + */ +public class Weapon extends ItemTemplate +{ + private WeaponType _type; + private boolean _isMagicWeapon; + private int _soulShotCount; + private int _spiritShotCount; + private int _mpConsume; + private int _baseAttackRange; + private int _baseAttackRadius; + private int _baseAttackAngle; + private int _changeWeaponId; + + private int _reducedSoulshot; + private int _reducedSoulshotChance; + + private int _reducedMpConsume; + private int _reducedMpConsumeChance; + + private boolean _isForceEquip; + private boolean _isAttackWeapon; + private boolean _useWeaponSkillsOnly; + + /** + * Constructor for Weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. + */ + public Weapon(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_WEAPON; + _isMagicWeapon = set.getBoolean("is_magic_weapon", false); + _soulShotCount = set.getInt("soulshots", 0); + _spiritShotCount = set.getInt("spiritshots", 0); + _mpConsume = set.getInt("mp_consume", 0); + _baseAttackRange = set.getInt("attack_range", 40); + final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) + { + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + } + else + { + _baseAttackRadius = 40; + _baseAttackAngle = 240; // 360 - 120 + } + + final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); + _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; + _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; + + final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); + _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; + _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; + _changeWeaponId = set.getInt("change_weaponId", 0); + _isForceEquip = set.getBoolean("isForceEquip", false); + _isAttackWeapon = set.getBoolean("isAttackWeapon", true); + _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); + } + + /** + * @return the type of Weapon + */ + @Override + public WeaponType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + @Override + public boolean isWeapon() + { + return true; + } + + /** + * @return {@code true} if the weapon is magic, {@code false} otherwise. + */ + @Override + public boolean isMagicWeapon() + { + return _isMagicWeapon; + } + + /** + * @return the quantity of SoulShot used. + */ + public int getSoulShotCount() + { + return _soulShotCount; + } + + /** + * @return the quantity of SpiritShot used. + */ + public int getSpiritShotCount() + { + return _spiritShotCount; + } + + /** + * @return the reduced quantity of SoultShot used. + */ + public int getReducedSoulShot() + { + return _reducedSoulshot; + } + + /** + * @return the chance to use Reduced SoultShot. + */ + public int getReducedSoulShotChance() + { + return _reducedSoulshotChance; + } + + /** + * @return the MP consumption with the weapon. + */ + public int getMpConsume() + { + return _mpConsume; + } + + public int getBaseAttackRange() + { + return _baseAttackRange; + } + + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + + /** + * @return the reduced MP consumption with the weapon. + */ + public int getReducedMpConsume() + { + return _reducedMpConsume; + } + + /** + * @return the chance to use getReducedMpConsume() + */ + public int getReducedMpConsumeChance() + { + return _reducedMpConsumeChance; + } + + /** + * @return the Id in which weapon this weapon can be changed. + */ + public int getChangeWeaponId() + { + return _changeWeaponId; + } + + /** + * @return {@code true} if the weapon is force equip, {@code false} otherwise. + */ + public boolean isForceEquip() + { + return _isForceEquip; + } + + /** + * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. + */ + public boolean isAttackWeapon() + { + return _isAttackWeapon; + } + + /** + * @return {@code true} if the weapon is skills only, {@code false} otherwise. + */ + public boolean useWeaponSkillsOnly() + { + return _useWeaponSkillsOnly; + } + + /** + * @param caster the Creature pointing out the caster + * @param target the Creature pointing out the target + * @param trigger + * @param type + */ + public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) + { + forEachSkill(type, holder -> + { + final Skill skill = holder.getSkill(); + if (Rnd.get(100) >= holder.getChance()) + { + return; + } + + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // Trigger only if both are good or bad magic. + if (trigger.isBad() != skill.isBad()) + { + return; + } + + // No Trigger if not Magic Skill or is toggle + if (trigger.isMagic() != skill.isMagic()) + { + return; + } + + // No Trigger if skill is toggle + if (trigger.isToggle()) + { + return; + } + + if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) + { + return; + } + } + + // Skill condition not met + if (!skill.checkCondition(caster, target, true)) + { + return; + } + + skill.activateSkill(caster, target); + + // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // notify quests of a skill use + if (caster.isPlayer()) + { + World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); + } + if (caster.isPlayer()) + { + final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); + sm.addSkillName(skill); + caster.sendPacket(sm); + } + } + }); + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java new file mode 100644 index 0000000000..610e720125 --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -0,0 +1,558 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.network.SystemMessageId; + +/** + * @author UnAfraid + */ +public class AppearanceStone +{ + private final int _id; + private final int _cost; + private final int _visualId; + private final long _lifeTime; + private final AppearanceType _type; + private final WeaponType _weaponType; + private final ArmorType _armorType; + private final AppearanceHandType _handType; + private final AppearanceMagicType _magicType; + private List _crystalTypes; + private List _targetTypes; + private List _bodyParts; + private List _races; + private List _racesNot; + private List _allVisualIds; + + public AppearanceStone(StatSet set) + { + _id = set.getInt("id"); + _visualId = set.getInt("visualId", 0); + _cost = set.getInt("cost", 0); + _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); + _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); + _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); + _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); + _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); + _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); + + final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); + if (targetType != AppearanceTargetType.NONE) + { + addTargetType(targetType); + } + + // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. + final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); + + // If no crystal type is defined, we must add all defaults. + if (crystalType == null) + { + switch (targetType) + { + case ACCESSORY: + case ALL: + { + addCrystalType(CrystalType.NONE); + // fallthrough + } + case WEAPON: + case ARMOR: + { + for (CrystalType cryType : CrystalType.values()) + { + if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) + { + addCrystalType(cryType); + } + } + } + } + } + else + { + addCrystalType(crystalType); + } + + final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); + if (bodyPart != ItemTemplate.SLOT_NONE) + { + addBodyPart(bodyPart); + } + + final Race race = set.getEnum("race", Race.class, Race.NONE); + if (race != Race.NONE) + { + addRace(race); + } + + final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); + if (raceNot != Race.NONE) + { + addRaceNot(raceNot); + } + } + + public int getId() + { + return _id; + } + + public int getVisualId() + { + return _visualId; + } + + public int getCost() + { + return _cost; + } + + public long getLifeTime() + { + return _lifeTime; + } + + public AppearanceType getType() + { + return _type; + } + + public WeaponType getWeaponType() + { + return _weaponType; + } + + public ArmorType getArmorType() + { + return _armorType; + } + + public AppearanceHandType getHandType() + { + return _handType; + } + + public AppearanceMagicType getMagicType() + { + return _magicType; + } + + public void addCrystalType(CrystalType type) + { + if (_crystalTypes == null) + { + _crystalTypes = new ArrayList<>(); + } + _crystalTypes.add(type); + } + + public List getCrystalTypes() + { + return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); + } + + public void addTargetType(AppearanceTargetType type) + { + if (_targetTypes == null) + { + _targetTypes = new ArrayList<>(); + } + _targetTypes.add(type); + } + + public List getTargetTypes() + { + return _targetTypes != null ? _targetTypes : Collections.emptyList(); + } + + public void addBodyPart(long part) + { + if (_bodyParts == null) + { + _bodyParts = new ArrayList<>(); + } + _bodyParts.add(part); + } + + public void addVisualId(AppearanceHolder appearanceHolder) + { + if (_allVisualIds == null) + { + _allVisualIds = new ArrayList<>(); + } + _allVisualIds.add(appearanceHolder); + } + + public List getVisualIds() + { + return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); + } + + public List getBodyParts() + { + return _bodyParts != null ? _bodyParts : Collections.emptyList(); + } + + public void addRace(Race race) + { + if (_races == null) + { + _races = new ArrayList<>(); + } + _races.add(race); + } + + public List getRaces() + { + return _races != null ? _races : Collections.emptyList(); + } + + public void addRaceNot(Race race) + { + if (_racesNot == null) + { + _racesNot = new ArrayList<>(); + } + _racesNot.add(race); + } + + public List getRacesNot() + { + return _racesNot != null ? _racesNot : Collections.emptyList(); + } + + /** + * @param player the actor requesting to use this appearance. + * @param targetItem the item to be modified with this appearance. + * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. + */ + public boolean checkConditions(Player player, Item targetItem) + { + if (targetItem == null) + { + return false; + } + + if (getTargetTypes().isEmpty()) + { + return false; + } + + if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); + return false; + } + + switch (_type) + { + case RESTORE: + { + if (targetItem.getVisualId() == 0) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); + return false; + } + + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + default: + { + // Seems like in retail item with already changed appearance, can be changed again without being restored. + + final AppearanceTargetType targetType = getTargetTypes().get(0); + switch (targetType) + { + case NONE: + { + return false; + } + case WEAPON: + { + if (!targetItem.isWeapon()) + { + player.sendPacket(SystemMessageId.WEAPONS_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ARMOR: + { + if (!targetItem.isArmor()) + { + player.sendPacket(SystemMessageId.ARMOR_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ACCESSORY: + { + if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + { + player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); + return false; + } + break; + } + case ALL: + { + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (findVisualChange(targetItem) == null) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + return true; + } + } + break; + } + } + + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (_weaponType != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) + { + if (_weaponType != WeaponType.CROSSBOW) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + } + + switch (_handType) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + } + + switch (_magicType) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + if (_armorType != ArmorType.NONE) + { + switch (_armorType) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + return true; + } + + public AppearanceHolder findVisualChange(Item targetItem) + { + for (AppearanceHolder holder : _allVisualIds) + { + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + { + continue; + } + + if (holder.getWeaponType() != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) + { + if (holder.getWeaponType() != WeaponType.CROSSBOW) + { + continue; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + continue; + } + } + + switch (holder.getHandType()) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + continue; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + continue; + } + break; + } + } + + switch (holder.getMagicType()) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + continue; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + continue; + } + } + } + } + + if (holder.getArmorType() != ArmorType.NONE) + { + switch (holder.getArmorType()) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + continue; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + continue; + } + } + } + } + return holder; + } + return null; + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java similarity index 93% rename from L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java rename to L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java index 6c2b4c08a5..53b89b29bf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; import java.util.EnumMap; import java.util.Map; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java similarity index 90% rename from L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java rename to L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 1e78189ef3..9cd198708e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..1099b77054 --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private long _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(long slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 93% rename from L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index 59f82cf9a4..d12e0b3ac9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.stats.Stat; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java new file mode 100644 index 0000000000..bfe1c295da --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -0,0 +1,57 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public class EnchantSupportItem extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isGiant; + private final ItemType type; + + public EnchantSupportItem(StatSet set) + { + super(set); + type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + public boolean isBlessed() + { + return _isBlessed; + } + + public boolean isGiant() + { + return _isGiant; + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 0cb1e2777f..3a7e3c1832 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -72,15 +72,15 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java new file mode 100644 index 0000000000..c8a309674f --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -0,0 +1,88 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Crystal Type enumerated. + * @author Adry_85 + */ +public enum CrystalType +{ + NONE(0, 0, 0, 0), + D(1, 1458, 11, 90), + C(2, 1459, 6, 45), + B(3, 1460, 11, 67), + A(4, 1461, 20, 145), + S(5, 1462, 25, 250), + S80(6, 1462, 25, 250), + S84(7, 1462, 25, 250), + R(8, 17371, 30, 500), + R95(9, 17371, 30, 500), + R99(10, 17371, 30, 500), + EVENT(11, 0, 0, 0); + + private final int _level; + private final int _crystalId; + private final int _crystalEnchantBonusArmor; + private final int _crystalEnchantBonusWeapon; + + CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) + { + _level = level; + _crystalId = crystalId; + _crystalEnchantBonusArmor = crystalEnchantBonusArmor; + _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; + } + + /** + * Gets the crystal type ID. + * @return the crystal type ID + */ + public int getLevel() + { + return _level; + } + + /** + * Gets the item ID of the crystal. + * @return the item ID of the crystal + */ + public int getCrystalId() + { + return _crystalId; + } + + public int getCrystalEnchantBonusArmor() + { + return _crystalEnchantBonusArmor; + } + + public int getCrystalEnchantBonusWeapon() + { + return _crystalEnchantBonusWeapon; + } + + public boolean isGreater(CrystalType crystalType) + { + return getLevel() > crystalType.getLevel(); + } + + public boolean isLesser(CrystalType crystalType) + { + return getLevel() < crystalType.getLevel(); + } +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 93% rename from L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index 3613e633af..b5f712627c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * EtcItem Type enumerated. diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java similarity index 94% rename from L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename to L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java index 74b59f572a..474f95a004 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 7f7ae8087c..d51a9b03d2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index a12ea3e031..a0803545c4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -54,13 +54,13 @@ import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index e78f33f533..3ccafd611f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -22,8 +22,8 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 512ef18689..0a83925e3c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,10 +40,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRandomCraft.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRandomCraft.java index b95eaabe63..7dea6f5049 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRandomCraft.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRandomCraft.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.data.xml.RandomCraftData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RandomCraftRequest; import org.l2jmobius.gameserver.model.holders.RandomCraftRewardItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExItemAnnounce; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Armor.java deleted file mode 100644 index d11c43f9cc..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Armor.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; - -/** - * This class is dedicated to the management of armors. - */ -public class Armor extends ItemTemplate -{ - private ArmorType _type; - - /** - * Constructor for Armor. - * @param set the StatSet designating the set of couples (key,value) characterizing the armor. - */ - public Armor(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); - - final long bodyPart = getBodyPart(); - if ((bodyPart == ItemTemplate.SLOT_ARTIFACT) || (bodyPart == ItemTemplate.SLOT_AGATHION)) - { - _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; - _type2 = ItemTemplate.TYPE2_ACCESSORY; - } - else if ((bodyPart == ItemTemplate.SLOT_NECK) || ((bodyPart & ItemTemplate.SLOT_L_EAR) != 0) || ((bodyPart & ItemTemplate.SLOT_L_FINGER) != 0) || ((bodyPart & ItemTemplate.SLOT_R_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_L_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_ARTIFACT_BOOK) != 0)) - { - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_ACCESSORY; - } - else - { - if ((_type == ArmorType.NONE) && (getBodyPart() == ItemTemplate.SLOT_L_HAND)) - { - _type = ArmorType.SHIELD; - } - _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; - _type2 = ItemTemplate.TYPE2_SHIELD_ARMOR; - } - } - - /** - * @return the type of the armor. - */ - @Override - public ArmorType getItemType() - { - return _type; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise - */ - @Override - public boolean isArmor() - { - return true; - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Henna.java deleted file mode 100644 index 09fdb7abcb..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Henna.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.l2jmobius.gameserver.enums.ClassId; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; - -/** - * Class for the Henna object. - * @author Zoey76 - */ -public class Henna -{ - private final int _dyeId; - private final int _dyeItemId; - private final Map _baseStats = new HashMap<>(); - private final int _wearFee; - private final int _wearCount; - private final int _cancelFee; - private final int _cancelCount; - private final int _duration; - private final List _skills; - private final List _wearClass; - - public Henna(StatSet set) - { - _dyeId = set.getInt("dyeId"); - _dyeItemId = set.getInt("dyeItemId"); - _baseStats.put(BaseStat.STR, set.getInt("str", 0)); - _baseStats.put(BaseStat.CON, set.getInt("con", 0)); - _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); - _baseStats.put(BaseStat.INT, set.getInt("int", 0)); - _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); - _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _wearFee = set.getInt("wear_fee"); - _wearCount = set.getInt("wear_count"); - _cancelFee = set.getInt("cancel_fee"); - _cancelCount = set.getInt("cancel_count"); - _duration = set.getInt("duration", -1); - _skills = new ArrayList<>(); - _wearClass = new ArrayList<>(); - } - - /** - * @return the dye Id. - */ - public int getDyeId() - { - return _dyeId; - } - - /** - * @return the item Id, required for this dye. - */ - public int getDyeItemId() - { - return _dyeItemId; - } - - public int getBaseStats(BaseStat stat) - { - return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); - } - - public Map getBaseStats() - { - return _baseStats; - } - - /** - * @return the wear fee, cost for adding this dye to the player. - */ - public int getWearFee() - { - return _wearFee; - } - - /** - * @return the wear count, the required count to add this dye to the player. - */ - public int getWearCount() - { - return _wearCount; - } - - /** - * @return the cancel fee, cost for removing this dye from the player. - */ - public int getCancelFee() - { - return _cancelFee; - } - - /** - * @return the cancel count, the retrieved amount of dye items after removing the dye. - */ - public int getCancelCount() - { - return _cancelCount; - } - - /** - * @return the duration of this dye. - */ - public int getDuration() - { - return _duration; - } - - /** - * @param skillList the list of skills related to this dye. - */ - public void setSkills(List skillList) - { - _skills.addAll(skillList); - } - - /** - * @return the skills related to this dye. - */ - public List getSkills() - { - return _skills; - } - - /** - * @return the list with the allowed classes to wear this dye. - */ - public List getAllowedWearClass() - { - return _wearClass; - } - - /** - * @param classId the class trying to wear this dye. - * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. - */ - public boolean isAllowedClass(ClassId classId) - { - return _wearClass.contains(classId); - } - - /** - * @param wearClassIds the list of classes that can wear this dye. - */ - public void setWearClassIds(List wearClassIds) - { - _wearClass.addAll(wearClassIds); - } -} \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Weapon.java deleted file mode 100644 index 832169f5f1..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is dedicated to the management of weapons. - */ -public class Weapon extends ItemTemplate -{ - private WeaponType _type; - private boolean _isMagicWeapon; - private int _soulShotCount; - private int _spiritShotCount; - private int _mpConsume; - private int _baseAttackRange; - private int _baseAttackRadius; - private int _baseAttackAngle; - private int _changeWeaponId; - - private int _reducedSoulshot; - private int _reducedSoulshotChance; - - private int _reducedMpConsume; - private int _reducedMpConsumeChance; - - private boolean _isForceEquip; - private boolean _isAttackWeapon; - private boolean _useWeaponSkillsOnly; - - /** - * Constructor for Weapon. - * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. - */ - public Weapon(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_WEAPON; - _isMagicWeapon = set.getBoolean("is_magic_weapon", false); - _soulShotCount = set.getInt("soulshots", 0); - _spiritShotCount = set.getInt("spiritshots", 0); - _mpConsume = set.getInt("mp_consume", 0); - _baseAttackRange = set.getInt("attack_range", 40); - final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) - { - _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); - } - else - { - _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 - } - - final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); - _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; - _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; - - final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); - _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; - _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; - _changeWeaponId = set.getInt("change_weaponId", 0); - _isForceEquip = set.getBoolean("isForceEquip", false); - _isAttackWeapon = set.getBoolean("isAttackWeapon", true); - _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); - } - - /** - * @return the type of Weapon - */ - @Override - public WeaponType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - @Override - public boolean isWeapon() - { - return true; - } - - /** - * @return {@code true} if the weapon is magic, {@code false} otherwise. - */ - @Override - public boolean isMagicWeapon() - { - return _isMagicWeapon; - } - - /** - * @return the quantity of SoulShot used. - */ - public int getSoulShotCount() - { - return _soulShotCount; - } - - /** - * @return the quantity of SpiritShot used. - */ - public int getSpiritShotCount() - { - return _spiritShotCount; - } - - /** - * @return the reduced quantity of SoultShot used. - */ - public int getReducedSoulShot() - { - return _reducedSoulshot; - } - - /** - * @return the chance to use Reduced SoultShot. - */ - public int getReducedSoulShotChance() - { - return _reducedSoulshotChance; - } - - /** - * @return the MP consumption with the weapon. - */ - public int getMpConsume() - { - return _mpConsume; - } - - public int getBaseAttackRange() - { - return _baseAttackRange; - } - - public int getBaseAttackRadius() - { - return _baseAttackRadius; - } - - public int getBaseAttackAngle() - { - return _baseAttackAngle; - } - - /** - * @return the reduced MP consumption with the weapon. - */ - public int getReducedMpConsume() - { - return _reducedMpConsume; - } - - /** - * @return the chance to use getReducedMpConsume() - */ - public int getReducedMpConsumeChance() - { - return _reducedMpConsumeChance; - } - - /** - * @return the Id in which weapon this weapon can be changed. - */ - public int getChangeWeaponId() - { - return _changeWeaponId; - } - - /** - * @return {@code true} if the weapon is force equip, {@code false} otherwise. - */ - public boolean isForceEquip() - { - return _isForceEquip; - } - - /** - * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. - */ - public boolean isAttackWeapon() - { - return _isAttackWeapon; - } - - /** - * @return {@code true} if the weapon is skills only, {@code false} otherwise. - */ - public boolean useWeaponSkillsOnly() - { - return _useWeaponSkillsOnly; - } - - /** - * @param caster the Creature pointing out the caster - * @param target the Creature pointing out the target - * @param trigger - * @param type - */ - public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) - { - forEachSkill(type, holder -> - { - final Skill skill = holder.getSkill(); - if (Rnd.get(100) >= holder.getChance()) - { - return; - } - - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // Trigger only if both are good or bad magic. - if (trigger.isBad() != skill.isBad()) - { - return; - } - - // No Trigger if not Magic Skill or is toggle - if (trigger.isMagic() != skill.isMagic()) - { - return; - } - - // No Trigger if skill is toggle - if (trigger.isToggle()) - { - return; - } - - if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) - { - return; - } - } - - // Skill condition not met - if (!skill.checkCondition(caster, target, true)) - { - return; - } - - skill.activateSkill(caster, target); - - // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // notify quests of a skill use - if (caster.isPlayer()) - { - World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); - } - if (caster.isPlayer()) - { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); - sm.addSkillName(skill); - caster.sendPacket(sm); - } - } - }); - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java deleted file mode 100644 index a568389489..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ /dev/null @@ -1,558 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author UnAfraid - */ -public class AppearanceStone -{ - private final int _id; - private final int _cost; - private final int _visualId; - private final long _lifeTime; - private final AppearanceType _type; - private final WeaponType _weaponType; - private final ArmorType _armorType; - private final AppearanceHandType _handType; - private final AppearanceMagicType _magicType; - private List _crystalTypes; - private List _targetTypes; - private List _bodyParts; - private List _races; - private List _racesNot; - private List _allVisualIds; - - public AppearanceStone(StatSet set) - { - _id = set.getInt("id"); - _visualId = set.getInt("visualId", 0); - _cost = set.getInt("cost", 0); - _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); - _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); - _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); - _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); - _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); - _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); - - final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); - if (targetType != AppearanceTargetType.NONE) - { - addTargetType(targetType); - } - - // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. - final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); - - // If no crystal type is defined, we must add all defaults. - if (crystalType == null) - { - switch (targetType) - { - case ACCESSORY: - case ALL: - { - addCrystalType(CrystalType.NONE); - // fallthrough - } - case WEAPON: - case ARMOR: - { - for (CrystalType cryType : CrystalType.values()) - { - if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) - { - addCrystalType(cryType); - } - } - } - } - } - else - { - addCrystalType(crystalType); - } - - final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); - if (bodyPart != ItemTemplate.SLOT_NONE) - { - addBodyPart(bodyPart); - } - - final Race race = set.getEnum("race", Race.class, Race.NONE); - if (race != Race.NONE) - { - addRace(race); - } - - final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); - if (raceNot != Race.NONE) - { - addRaceNot(raceNot); - } - } - - public int getId() - { - return _id; - } - - public int getVisualId() - { - return _visualId; - } - - public int getCost() - { - return _cost; - } - - public long getLifeTime() - { - return _lifeTime; - } - - public AppearanceType getType() - { - return _type; - } - - public WeaponType getWeaponType() - { - return _weaponType; - } - - public ArmorType getArmorType() - { - return _armorType; - } - - public AppearanceHandType getHandType() - { - return _handType; - } - - public AppearanceMagicType getMagicType() - { - return _magicType; - } - - public void addCrystalType(CrystalType type) - { - if (_crystalTypes == null) - { - _crystalTypes = new ArrayList<>(); - } - _crystalTypes.add(type); - } - - public List getCrystalTypes() - { - return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); - } - - public void addTargetType(AppearanceTargetType type) - { - if (_targetTypes == null) - { - _targetTypes = new ArrayList<>(); - } - _targetTypes.add(type); - } - - public List getTargetTypes() - { - return _targetTypes != null ? _targetTypes : Collections.emptyList(); - } - - public void addBodyPart(long part) - { - if (_bodyParts == null) - { - _bodyParts = new ArrayList<>(); - } - _bodyParts.add(part); - } - - public void addVisualId(AppearanceHolder appearanceHolder) - { - if (_allVisualIds == null) - { - _allVisualIds = new ArrayList<>(); - } - _allVisualIds.add(appearanceHolder); - } - - public List getVisualIds() - { - return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); - } - - public List getBodyParts() - { - return _bodyParts != null ? _bodyParts : Collections.emptyList(); - } - - public void addRace(Race race) - { - if (_races == null) - { - _races = new ArrayList<>(); - } - _races.add(race); - } - - public List getRaces() - { - return _races != null ? _races : Collections.emptyList(); - } - - public void addRaceNot(Race race) - { - if (_racesNot == null) - { - _racesNot = new ArrayList<>(); - } - _racesNot.add(race); - } - - public List getRacesNot() - { - return _racesNot != null ? _racesNot : Collections.emptyList(); - } - - /** - * @param player the actor requesting to use this appearance. - * @param targetItem the item to be modified with this appearance. - * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. - */ - public boolean checkConditions(Player player, Item targetItem) - { - if (targetItem == null) - { - return false; - } - - if (getTargetTypes().isEmpty()) - { - return false; - } - - if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); - return false; - } - - switch (_type) - { - case RESTORE: - { - if (targetItem.getVisualId() == 0) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); - return false; - } - - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - default: - { - // Seems like in retail item with already changed appearance, can be changed again without being restored. - - final AppearanceTargetType targetType = getTargetTypes().get(0); - switch (targetType) - { - case NONE: - { - return false; - } - case WEAPON: - { - if (!targetItem.isWeapon()) - { - player.sendPacket(SystemMessageId.WEAPONS_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ARMOR: - { - if (!targetItem.isArmor()) - { - player.sendPacket(SystemMessageId.ARMOR_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ACCESSORY: - { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) - { - player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); - return false; - } - break; - } - case ALL: - { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (findVisualChange(targetItem) == null) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - return true; - } - } - break; - } - } - - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (_weaponType != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) - { - if (_weaponType != WeaponType.CROSSBOW) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - } - - switch (_handType) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - } - - switch (_magicType) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - if (_armorType != ArmorType.NONE) - { - switch (_armorType) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - return true; - } - - public AppearanceHolder findVisualChange(Item targetItem) - { - for (AppearanceHolder holder : _allVisualIds) - { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) - { - continue; - } - - if (holder.getWeaponType() != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) - { - if (holder.getWeaponType() != WeaponType.CROSSBOW) - { - continue; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - continue; - } - } - - switch (holder.getHandType()) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - continue; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - continue; - } - break; - } - } - - switch (holder.getMagicType()) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - continue; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - continue; - } - } - } - } - - if (holder.getArmorType() != ArmorType.NONE) - { - switch (holder.getArmorType()) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - continue; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - continue; - } - } - } - } - return holder; - } - return null; - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fe698d8e2a..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private long _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(long slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java deleted file mode 100644 index 13d6b5a2ee..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public class EnchantSupportItem extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isGiant; - private final ItemType type; - - public EnchantSupportItem(StatSet set) - { - super(set); - type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - public boolean isBlessed() - { - return _isBlessed; - } - - public boolean isGiant() - { - return _isGiant; - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java deleted file mode 100644 index d059efd025..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Crystal Type enumerated. - * @author Adry_85 - */ -public enum CrystalType -{ - NONE(0, 0, 0, 0), - D(1, 1458, 11, 90), - C(2, 1459, 6, 45), - B(3, 1460, 11, 67), - A(4, 1461, 20, 145), - S(5, 1462, 25, 250), - S80(6, 1462, 25, 250), - S84(7, 1462, 25, 250), - R(8, 17371, 30, 500), - R95(9, 17371, 30, 500), - R99(10, 17371, 30, 500), - EVENT(11, 0, 0, 0); - - private final int _level; - private final int _crystalId; - private final int _crystalEnchantBonusArmor; - private final int _crystalEnchantBonusWeapon; - - CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) - { - _level = level; - _crystalId = crystalId; - _crystalEnchantBonusArmor = crystalEnchantBonusArmor; - _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; - } - - /** - * Gets the crystal type ID. - * @return the crystal type ID - */ - public int getLevel() - { - return _level; - } - - /** - * Gets the item ID of the crystal. - * @return the item ID of the crystal - */ - public int getCrystalId() - { - return _crystalId; - } - - public int getCrystalEnchantBonusArmor() - { - return _crystalEnchantBonusArmor; - } - - public int getCrystalEnchantBonusWeapon() - { - return _crystalEnchantBonusWeapon; - } - - public boolean isGreater(CrystalType crystalType) - { - return getLevel() > crystalType.getLevel(); - } - - public boolean isLesser(CrystalType crystalType) - { - return getLevel() < crystalType.getLevel(); - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 5f818e731e..2ec9bd8f69 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 17c83523b7..44a87d7c08 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/Quest.java index c5d11839a5..3f3ec696ae 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/Skill.java index 4f8839c353..d777746032 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index bbba3742ef..2055a805bb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -58,10 +58,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 54907880aa..63f20c77b2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -39,11 +39,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 45d32295d2..463ea798f0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 577ca267e7..65b445397e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index f4bf542a6d..05d0c728ec 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 38a7116383..ff0ad75b8a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index c1cac0d20a..02c4f00cf6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 1839afb5ce..334fb9252a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 7109a54ed1..5df6b208a3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index 165f9b4668..80e30184ff 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index df3acc3df1..7c51b0ad38 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 31a1699285..11832b5266 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 3c8e441156..8548ad1d3a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index cfb6455ad0..31d29ef3dd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 3b750492b6..379ce7e1ee 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 7323e0f5c9..8ba3d95227 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -52,10 +52,10 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 212831b0aa..881fa14e23 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 7c2ffd3381..04cf0eb4aa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 8e4db9d92c..a7e3f28ed6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 6c3be1e95f..2a92b7c8f7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1108bbf2dd..751e6d4a4f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 4187b31783..fe9f7b3d25 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,8 +31,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 6cc03e2c2b..48cdb8e80b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index a02ebff6c0..5bf735ff2f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index e8d9134e51..ae1ce1bebe 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 27720bdb00..31c0ac34f6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index e8f653a83c..a4e3d49ec4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index bb3f77d7be..b0316c2a16 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index ce98ab493d..d0add3fa49 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 595da81538..ab9f0c33f7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 945ff531e4..b9c3900403 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 18485fdbd4..4d3adf25dc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 04ebc1f9a7..353d28aeb9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 8ac47eea12..5364e67986 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index cb16d5cc7d..cd8e900014 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 3e06fab27a..47ce1532d4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index ff56c5b0a4..88a9e1c787 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 61920f471b..f89be1cfcb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 6efd85f083..cff7284f2f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 17fa6aeaf2..f02aaa9ace 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 16c15edcdf..d3b33be1bb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -39,11 +39,11 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 81e3a8f4c9..7e89bd6ed3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java index cf6407ac6a..f02b7db6aa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.ShortCuts; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java index e189ffdd74..e750f17389 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.BlessingItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java index c247027020..249a869c81 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.blessing; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java index 9326803882..b602edf72b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.CollectionDataHolder; import org.l2jmobius.gameserver.model.holders.ItemCollectionData; import org.l2jmobius.gameserver.model.holders.PlayerCollectionData; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index d8e28130cc..9cc69554c4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 0b67368833..53112870da 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index 08705b38da..f926d90210 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 7ed7806afb..8562dc024b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 1382713f2f..beca532961 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index fc38b11104..ccce24215e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 25c9792ec1..3220827fbb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java index e3a0b08b2c..7a72b8ca49 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.PrimeShopRequest; import org.l2jmobius.gameserver.model.holders.LimitShopProductHolder; import org.l2jmobius.gameserver.model.holders.LimitShopRandomCraftReward; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.AccountVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index 2c555ed3fe..980b299845 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java index deb54b2612..f10148af7e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java @@ -15,7 +15,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java index c9a4bc2a29..4bd0543f06 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java @@ -11,8 +11,8 @@ import org.l2jmobius.gameserver.ai.NextAction; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java index f264888149..aa8e58c146 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java @@ -7,8 +7,8 @@ import org.l2jmobius.gameserver.ai.NextAction; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java index 94aaa87554..fee0b270a5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java index 7ba2990cf4..13512321f5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java index aad73b105e..081a29e9cd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java index 6feb078651..a3e449b1cc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java index 7d885e7bc8..7b6bf5b6c3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.RandomCraftData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RandomCraftRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.randomcraft.ExCraftExtract; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java index a98c74a7c7..7a3aad8282 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets.randomcraft; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRandomCraft; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.randomcraft.ExCraftRandomInfo; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51cd76618e..af8b12547e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 84da450597..c1843be93c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 61fd93e55c..6063a54535 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index 5a7a9c9c3b..a0ba15da9f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.holders.DamageTakenHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 43fa6faeb8..6f00d41989 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 93588924fe..077f33cb49 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 07725028a6..76375a86f7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c9e5eabc7..ef1d37297e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index e4fb9e4160..b65005003d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 51abfa9d3e..f49138fafe 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 4bd0a38bda..7e0614b359 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 6d0df16c27..0e6e64c7b2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 61a01d067c..658087380a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 84bc5a6eba..3800940bac 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index b79342c0a8..3a780986a0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index bd768c74e2..c4598a72e6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index c94eae4c08..00d7618d34 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ced39204d3..fbb5c84dfe 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4068629bde..d05590cbde 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 0e6211e63b..358ee2361b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 0dc656cef6..2d352ea5cd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c742d534c4..c59568bf1d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index a22b36335e..35ca986d35 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 271ec4401b..37150ec357 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java index db11b2a9b4..d4351a66f9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 6b8cd1358f..c32d4f7c04 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java index 807bb18802..f45d3262ac 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractInventoryUpdate; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java index 92ad2b6fc1..cd0744b2c4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.pet; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java index d4e38ef328..a66350d83b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.network.serverpackets.vip; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index fceabef738..e60ad5658f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro; /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 7553a3233e..fb0db44e8e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Guard; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/DocumentBase.java index cebed94cd2..a2f01e4fae 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -47,6 +47,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -135,9 +138,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java index 2ee34992de..f3f586bddb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.events.ListenerRegisterType; import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPremiumManagerShowHtml; import org.l2jmobius.gameserver.network.serverpackets.ExShowVariationCancelWindow; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/SiegeGuards.java index 8ac4fe72af..c9ca7df743 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/SiegeGuards.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/SiegeGuards.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/custom/SellBuff/SellBuff.java index 4473f65adc..2d7d26812f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/custom/SellBuff/SellBuff.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/custom/SellBuff/SellBuff.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.AbstractScript; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index fa45b28c67..42d382f269 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index dd4215411e..a8e6c06eed 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.quest.LongTimeEvent; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java index 822a68003d..8db4dcdfeb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/actionshifthandlers/ItemActionShift.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.handler.IActionShiftHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class ItemActionShift implements IActionShiftHandler diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java index 7c2572fa42..14325a32cf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminCreateItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.GMViewItemList; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java index 7ed645f6e6..45c1dfec5f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminDestroyItems.java @@ -18,8 +18,8 @@ package handlers.admincommandhandlers; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index c76d4f8c78..2d14757f79 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -20,9 +20,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index 64d954ba91..cc602e09a6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -21,8 +21,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.IAdminCommandHandler; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.util.BuilderUtil; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 5b1db54836..e7113941ec 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Warehouse; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.WareHouseDepositList; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/Freight.java index f73f3c2e73..5d3caadfd5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/Freight.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/Freight.java @@ -19,8 +19,8 @@ package handlers.bypasshandlers; import org.l2jmobius.gameserver.handler.IBypassHandler; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.PackageToList; import org.l2jmobius.gameserver.network.serverpackets.WareHouseWithdrawalList; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index dcff53c86d..98919a85ec 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.util.HtmlUtil; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 978b338c06..d2a939b605 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.handler.IParseBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.DropHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.spawns.NpcSpawnTemplate; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 7dedbdf3bf..4b8b925c48 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java index 2c7c5fce17..03a078daf8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbnormalTimeChange.java @@ -23,7 +23,7 @@ import java.util.Set; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index 2e5d68785d..08c35b62f2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 0b6774eff7..ed51c242cf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java index a173c4b130..d86280c4c9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AbstractStatEffect.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionPlayerIsInCombat; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddHate.java index fec8df8310..8859758851 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddHate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddHate.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java index ef698d3144..98c614b7e5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddHuntingTime.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneEnter; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java index 87fda4e192..01c53aed5e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AddTeleportBookmarkSlot.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index bf10347e22..b38ef25bc6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Backstab.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Backstab.java index 2a56432b98..16b4bf8ee7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Backstab.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Backstab.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Betray.java index bf80e33676..0ddab7e7c9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 8a23e5da8c..33e2dd1955 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java index 720f25ba5b..1e07fe4331 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlinkSwap.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 3e38962b20..6145190929 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index 13e978ec69..7c7a01373a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index c07848a08b..6c0a38f5b4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 90346cbf36..04b93fc3de 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a88030c15c..362ec9245c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index a729f9e281..9ade23904f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.PunishmentManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentTask; import org.l2jmobius.gameserver.model.punishment.PunishmentType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index 5013623514..299fb5a203 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillUse; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 59e710d83f..6615820270 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Bluff.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Bluff.java index 5b65a8b517..d53d8b8dd1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Bluff.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Bluff.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.StartRotation; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java index 3232ee3181..6a445ae252 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallLearnedSkill.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallParty.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallParty.java index 438e598f65..7da35c76e4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallParty.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index e1681d19a4..8e1d2e4ebd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SummonRequestHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java index 4ee47ec85a..146b90f2f1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallRandomSkill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java index a882f4baad..1dc7cb8af5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallSkill.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 4e5a8d7aaf..1950403a0d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java index 1d104a4069..bb6ed54b11 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CallTargetParty.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index c4e5a98a86..a8151929e5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 20a0416c0a..cc2cc42029 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.TemplateChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java index 2960b994ae..a022302654 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java index f60b889acd..1567a4ca12 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java index 61ee3471a8..d290600f9e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index 6e043ac66c..f5c8d5972d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Compelling.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Compelling.java index 2d575facd8..664949df27 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Compelling.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Compelling.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Confuse.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Confuse.java index 2ad514eeb5..67c18c59ca 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Confuse.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Confuse.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java index 50441dab3f..3d562d90db 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index e52e649f3c..d7a25309f2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Cp.java index 2da7780db8..294a20f13c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java index ac89e7db8a..680ecb8506 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CpHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java index 9346e2d529..2a68bdb6b8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index c683d24a20..8f4f985b2b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 3023f8e565..976f8f25ad 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 2d064e2550..c976245fa1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index a7ecb56209..9788de40cd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 6129d1e3fa..6a39b562e3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java index d1ac92d11b..9e0d3be30a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index ac0c31a8fb..2dbafbd01b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java index 0efdd800b1..d4578c358b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeleteHate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java index dfefd3676a..0137ae244f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeleteHateOfMe.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java index a0e8fa983e..bbf75aef45 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DeleteTopAgro.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java index 40062e2607..60c7020608 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DetectHiddenObjects.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Detection.java index b6a614f81d..bebd048abb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Detection.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Detection.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 4ab19446e8..1d83eb4733 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Disarm.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Disarm.java index 437b502a95..b8985f0fef 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Disarm.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Disarm.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java index 025ceedd06..613bba57ff 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java index 19c8575d78..3e83f7956a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelAll.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java index 42d679837a..8992f0372e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index e89d05ab63..d0103678b7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java index 23f5e2cf05..7c1eb5a868 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotMyself.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 615ef111da..a2efe891eb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index de724e087c..69ea380985 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index d351297b27..fed17e00b3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 3d9e931c05..736dcbdf09 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index f7ae4e2418..f48995efe5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Escape.java index bc32926ef4..4ac33114c7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 415ac6a0d0..0d55fe839c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 851e34b16d..4e55083db5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 7490c6ab78..04bf3a7031 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Feed.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Feed.java index 1659ca07d9..a2c0c78b44 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Feed.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Feed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 7c686ebedf..d202fae9e2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java index f93de4ce3c..f875d88dfa 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FlipBlock.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 75afe1c1ab..54aebb801a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java index 1866a34d94..b7c74b3b74 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FocusMaxMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java index 7f55fdc9ed..7e0edf65b8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FocusMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 1712fe6e34..da6af99db9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java index 53d758d279..1ab432beac 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 28b0f453fc..5c2f25e7f2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java index d7c2b53b69..0018a38dcf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveClanReputation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java index 8d5bcdc798..2fa9b3be77 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveExpAndSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java index d1bf2055ba..cd7d5f8221 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveFame.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveHonorCoins.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveHonorCoins.java index c3a6ea1a0b..1c988aba4f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveHonorCoins.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveHonorCoins.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java index eb27439923..d5b009115f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveRecommendation.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVoteSystemInfo; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java index e1ed216fef..362dfef741 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java index 2ed9c1c346..7f5e0e87a1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/GiveXp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 3e8c1d64f2..e3acca6b6a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java index ad06fbd0ac..8dec7ddec0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HairAccessorySet.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index ebbd33bda0..f952b58fa2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java index cbb2ace353..c972a64ee8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.SiegeFlag; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 94958b7956..bd1cbe6e09 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java index 3f5e92bb2e..65bd99edef 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 1bb129993f..3cfcc73e45 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 0ad3057429..32b910a408 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index ea9ed06934..e7f75518b2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -18,7 +18,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Hp.java index ceb2e22058..6d6bc006aa 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index f060b0d73b..5de968a191 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index f0dcef68c8..a503aab636 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index 0692a6c172..9dda89edb8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 41f7409b9a..80f93ffb00 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index 1d3f8b8155..4f901b9b17 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java index 58b04d372c..5caec85962 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/KarmaCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 02468039cf..742f98e38b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Lethal.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Lethal.java index f55f9391e6..ec856f0a26 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Lethal.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Lethal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index a047fb442a..188c99e322 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java index 1d3b0c7cd9..d470bdcfdc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAbnormalDispelAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index ff448a83df..f24342fe2e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index 6e31ffe7b6..03eb948a31 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java index 9f11ddcb86..6255f2e332 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 0f13adbebc..d7c825f62c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java index 37e374466e..bba922303c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackRange.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index 3a86e14d98..9bcbd4de97 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index 8bbb0e59a5..b995cc61c1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index dd4f32e1c6..446938a672 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index 814910f0b9..120e7972ed 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 7b13ecc9af..f296eb4566 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java index 91e7a10608..7eaeaaf423 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 5b554e5d92..53d2299ad5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 1ff5e6569e..bf46bd9fe5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index 2f23518ec9..8a74021876 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java index 529de87862..cdb4f669f9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MaxMp.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyCraftPoints.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyCraftPoints.java index 49518c6b1d..ba3a1ceb95 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyCraftPoints.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyCraftPoints.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyDeathPoints.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyDeathPoints.java index c9435e06a8..1a18c4d1e2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyDeathPoints.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyDeathPoints.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyMagicLampPoints.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyMagicLampPoints.java index 118dd8ac0c..fe8710dea5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyMagicLampPoints.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyMagicLampPoints.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java index 6ff76c46a3..daee3c0939 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 6eb0b26d94..3a954073f3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index c6f6531b6a..f29a23c0f0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 62795498f3..a1d5d9f5c5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java index d0d85e7571..4fc9bde3ca 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenChest.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java index 742ca00283..3d97c9ac22 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenCommonRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java index 651b04ec52..86a6f3daf7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenDoor.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java index 3eb4d77710..8b4d315b50 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/OpenDwarfRecipeBook.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 09a6bfd779..fb6e27470c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index e19a0638fb..9cc75bc8e2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 4a3d0dd2df..b2cab002a2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index a31366e23c..f5195719ed 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 7e31919c16..d7598cca0e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 436f7ef66b..94f1510f14 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 658563aca3..6d5cc2cb9b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PkCount.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PkCount.java index adac2c7c97..fc95684d93 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PkCount.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PkCount.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Plunder.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Plunder.java index 533e839854..39b2180787 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Plunder.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Plunder.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 1e5c606907..ba6b001a7b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index d58e1b401f..17148a3269 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java index 27b5ff9193..226acb4484 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RandomizeHate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java index aaa9641567..721bf8ce08 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 0bd71cbf4f..089e3d780d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java index bed16d794b..cf175f8b7a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RebalanceHPSummon.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 068e4437cc..a2752be5fa 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index fa490ec329..591b092275 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java index 8cff7e4d20..24c811890b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.AirShip; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Relax.java index d826719944..fb9e63abe5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java index 3c5fad4cde..733ea90dbd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ResetInstanceEntry.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index d27ef684fd..232c17fefc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Restoration.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Restoration.java index b2c24db4d9..c1996baf44 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Restoration.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Restoration.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 9b000811ff..382c248297 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.RestorationItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java index e47f8eac3e..eefb3cf0f3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Resurrection.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index 1645da7f8f..52daa48131 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MathUtil; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java index afaf22a699..4585b615af 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Root.java index e960f0c768..e38fc62fed 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java index e78e200304..5dca033d2b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SacrificeSummon.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java index 326bd6a9cc..ae8351148e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SayhaGraceSupport.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java index 5928452eb1..6d678adac5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SendSystemMessageToClan.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SetCp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SetCp.java index 89a6087032..b97d03c0e3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SetCp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SetCp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SetHp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SetHp.java index 5a4f3f1842..a415f3c917 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SetHp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SetHp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.StatModifierType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java index fd88366e8d..34be3047ef 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SetSkill.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index 99b7b6998c..0ad05bbf2a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java index 6d72be8d0b..2583feff95 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillTurning.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 43a3975ac2..deaf2b1557 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java index 090580340e..8df6b0b267 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index d65939613a..87dec4a24c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Sow.java index a25939d670..9c4b9bbf4b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Speed.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Speed.java index 2b48350bdd..48531a88ac 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Speed.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Speed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index ed4f98ed3d..f5fc951a7e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import org.l2jmobius.gameserver.model.events.returns.DamageReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Spoil.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Spoil.java index dbe054b83a..52522f2be8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Spoil.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Spoil.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java index 5957c9937d..49013eb6ee 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java index fad0fb3a8d..04d5ff6caf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index 2c373dd303..ce80f63fcb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.MoveType; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java index fd31244742..aa10ea54af 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Summon.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Summon.java index b4ea6e761f..bfc5324c4d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Summon.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Summon.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java index a91eed00bf..1c3d63ae84 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java index c3ed2793e7..d09a2772e9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.CubicTemplate; import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java index ef987f0542..b75dc9b6ca 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonHallucination.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java index 37913da25b..a3af196d5d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonMulti.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index dff1986840..05f357e049 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.instance.EffectPoint; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java index b3a566f95c..147c88b3c8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonPet.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.PetEvolveHolder; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java index 716a304956..210c4d0169 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java index 0c6e3c6b6b..fa3272d180 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Sweeper.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 178771a284..6cb3e3e3b1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java index 2a0bd0d1fd..ddbabbd88f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeCastle.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java index 71cca0429c..98ad973eee 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeCastleStart.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java index 287a107268..72cbcc8a45 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeFort.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java index 32f8816dd9..867a9d792e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TakeFortStart.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index e6bd601fc5..3d98bf6169 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java index e759e2e17a..0dae0c801b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TargetCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 8ea64213a1..21e8f40f54 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java index f1fb9142f9..9b8cf45ff1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TargetMeProbability.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Teleport.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Teleport.java index 8208899218..5f50d7d009 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Teleport.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Teleport.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java index de486a2eb0..5bed41a2db 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToNpc.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 83860039e2..a22aaf477d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index b1266f6545..41effd259a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 9c5ecfadb7..2a94750f00 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation; import org.l2jmobius.gameserver.network.serverpackets.FlyToLocation.FlyType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index a0b0bca8d4..ebfc75e3f0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 8c77ccd7b0..6dd76e7426 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index bdab0789f2..03e5f208fa 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java index 98c3bf71b9..e802806bb8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TrapDetect.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java index 8665a9a078..3a88f2d0a9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TrapRemove.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Trap; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java index 09201c9478..d34d4a7118 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkill.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0267c9dfc4..4b0e12f4ec 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 812cc14e33..f6183f77b3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureAttackAvoid; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 98df81ddc9..f4127de3b5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index c212299a8a..f2457814d6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageReceived; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java index 8c1be275c7..200a0cc1fd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java index daec89608d..8995ff144c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByHpPercent.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureHpChange; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index c9deb10298..39afaaf8b0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureKilled; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index 237e97d183..26a78cca79 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 4c72c5709e..e59d5c007b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSkillFinishCast; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 15632087e2..6b25d65869 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDamageDealt; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java index 62daf556a1..d2f8d20c4d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java index 612f9fb66c..2a7f58ea1f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 7642ce69b9..db2fb978e5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java index 19b4ca24fa..01cc9c349d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/UnsummonAgathion.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerUnsummonAgathion; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoCubic; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java index b0f457418e..78c47537cb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/UnsummonServitors.java @@ -19,7 +19,7 @@ package handlers.effecthandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index 10c334600a..1e7d63449c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/VipUp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/VipUp.java index 9cf1267bbb..f716953da2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/VipUp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/VipUp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java index 96033d321b..5f0a327962 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java index ad487044b9..db8516fac9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/AddSpiritExp.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ElementalSpirit; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Appearance.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Appearance.java index 8fd26fc33a..d8790377ee 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Appearance.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Appearance.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.appearance.ExChooseShapeShiftingItem; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index ecb73b365e..30e5fd51af 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 47b2418ab8..ab876ab449 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index ba621c653f..f553a0c846 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 9b16668969..119fe1f81e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BlessingScrolls.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BlessingScrolls.java index e2ba792dd5..2d475bb669 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BlessingScrolls.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/BlessingScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.BlessingItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.blessing.ExOpenBlessOptionScroll; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Book.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Book.java index 8abe5b0c4c..7ebcc8d2f8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Book.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Book.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index 0554a6bd20..9a3289731b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.cache.HtmCache; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Calculator.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Calculator.java index dc03c11109..d8622270a5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Calculator.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Calculator.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowCalculator; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 7aba89bdd6..238d1a11bc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.attributechange.ExChangeAttributeItemList; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 93579931c9..589d400d6c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java @@ -19,7 +19,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Elixir.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Elixir.java index 2ce753368d..c823bbe457 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Elixir.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Elixir.java @@ -17,7 +17,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java index 77af181c86..c81bbc6bfc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/EnchantAttribute.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExChooseInventoryAttributeItem; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java index bb3abf0580..55d3c3a4e2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/EnchantScrolls.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ChooseInventoryItem; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/EventItem.java index fe92096701..5abfc22558 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/EventItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/EventItem.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Block; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index d7008524ad..6ed099eccf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 4cebf9c999..9731abbc15 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index f4945502b6..db39fd9a60 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index bbb5ad29de..254021b66a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java index 899b682c18..bc5244b878 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ItemSkills.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 5c0399e986..1e3613fc0c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java index a64172c3dc..40cb212cfd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/LimitedSayha.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Maps.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Maps.java index 99f7ff6a3c..658e6e3968 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Maps.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Maps.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowMiniMap; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java index 5045655bf6..ac9a81c7d9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent; import org.l2jmobius.gameserver.model.events.annotations.RegisterType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerDlgAnswer; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ConfirmDlg; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java index f72fb8539e..a7209db776 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/NicknameColor.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExRequestChangeNicknameColor; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index f3f0e251e2..d12ffdecb4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 70ca58da2a..105834d461 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.RecipeList; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java index 05a3885973..461e78bb8b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/RollingDice.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.Dice; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Seed.java index ad8c1d4d33..e68a2c5552 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Chest; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index c6d8ec7a1b..1f44066740 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java index c99b82fea0..ce7568d983 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SpecialXMas.java @@ -18,7 +18,7 @@ package handlers.itemhandlers; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ShowXMasSeal; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 98ae8c4eaf..353347df87 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java index 3988e77104..587f809dc9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/SummonItems.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Playable; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.PetItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 77b9a03185..c0d47bc8de 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -21,10 +21,10 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java index df9df77858..9d4beb3b69 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipShieldSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java index 84046ceb18..fdbdafd91e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -19,8 +19,8 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java index 6407fe519d..3f22603b1f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipWeaponSkillCondition.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java index 638c600ff8..0dbae2591b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/Op2hWeaponSkillCondition.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java index 5e227f139e..c14a476ce4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpChangeWeaponSkillCondition.java @@ -19,7 +19,7 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java index 6e5acf3cef..808fb362dc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpEquipItemSkillCondition.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.enums.SkillConditionAffectType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 776a4af873..0bf6b619b8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -22,11 +22,11 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java index ae260af2da..288b7487b3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index fe95855335..1fd9deb62c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java @@ -18,8 +18,8 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Give.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Give.java index 139eaf3945..5cc5d2c39b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Give.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/player/Give.java @@ -19,7 +19,7 @@ package handlers.telnethandlers.player; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java index 3732c8cdb0..920eadb0b6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java @@ -44,7 +44,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AdminForgePacket; import org.l2jmobius.gameserver.network.telnet.ITelnetCommand; import org.l2jmobius.gameserver.taskmanager.DecayTaskManager; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java index 92d83111cd..bf2ecd6938 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java @@ -19,7 +19,7 @@ package quests.Q10971_TalismanEnchant; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java index fd5898fa51..ac11b50139 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java @@ -18,7 +18,7 @@ package quests.Q10973_EnchantingAgathions; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java index 71aa6530b4..7ab80fefd9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java @@ -19,7 +19,7 @@ package quests.Q10974_NewStylishEquipment; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.NpcStringId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 750072ec1b..625ea43dc4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.AutoAttackStart; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 8444c0fd1e..b57b74ef6f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -52,7 +52,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableFacti import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableHate; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/CreatureAI.java index bb78cafa1c..670e0a7192 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -47,7 +47,7 @@ import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMoveFinished; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/DoorAI.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/DoorAI.java index 57c965cd83..0f2fb79156 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/DoorAI.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/DoorAI.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.instance.Door; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java index 105eaca8e4..57d83a0a83 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Doppelganger; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/PlayableAI.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/PlayableAI.java index 2cae7d7bf8..92ae35c8fb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/PlayableAI.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/PlayableAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/SummonAI.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/SummonAI.java index d80d2411cd..d57397e064 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/SummonAI.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/SummonAI.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/VehicleAI.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/VehicleAI.java index 8a8ac6ede6..fc5ff37e36 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/VehicleAI.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/ai/VehicleAI.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.ai; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Vehicle; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 7ccefd956f..00f5e77061 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.gameserver.data.xml.ArmorSetData; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/ItemTable.java index be8e8b5cfc..12235d6604 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -48,12 +48,12 @@ import org.l2jmobius.gameserver.model.actor.instance.EventMonster; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.item.OnItemCreate; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.AmmunitionSkillList; import org.l2jmobius.gameserver.util.DocumentItem; import org.l2jmobius.gameserver.util.GMAudit; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java index a9849da481..294321be58 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.PetEvolveHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java index 313709ab07..4b2cf3b555 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/AppearanceItemData.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java index 0f8815bcc4..475f0085d8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/ArmorSetData.java @@ -38,7 +38,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/BuyListData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/BuyListData.java index d134fe859e..c57e62c683 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/BuyListData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/BuyListData.java @@ -36,7 +36,7 @@ import org.l2jmobius.commons.util.file.filter.NumericNameFilter; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Loads buy lists for NPCs. diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/CollectionData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/CollectionData.java index 40504de824..baf3bcf2b8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/CollectionData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/CollectionData.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.CollectionDataHolder; import org.l2jmobius.gameserver.model.holders.ItemCollectionData; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * Written by Berezkin Nikolay, on 04.05.2021 diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java index 1966613539..294a8b45f6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/CombinationItemsData.java @@ -26,9 +26,9 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index e61c051eb8..651d722d20 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.ElementalItemType; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java index 2e30e4b81c..0fee1f44b5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemData.java @@ -28,9 +28,9 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Loads item enchant data. diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java index 82efdd78a7..a8ec4aedf8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; -import org.l2jmobius.gameserver.model.items.enchant.EnchantRateItem; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScrollGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.enchant.EnchantRateItem; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScrollGroup; import org.l2jmobius.gameserver.util.Util; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index 4b742beb6e..ffd6eef139 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * This class holds the Enchant HP Bonus Data. diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java index 8e549a3a73..5055066a15 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnchantItemOptionsData.java @@ -25,7 +25,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java index 7cd26c82d5..39125a9872 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/EnsoulData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulFee; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/HennaData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/HennaData.java index 86d06999b3..6ee5384e82 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/HennaData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/HennaData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Node; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java index 629cf7dc77..cadb02a404 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/InitialEquipmentData.java @@ -31,7 +31,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; /** * This class holds the Initial Equipment information.
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java index 765422500e..47ed7421e8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/InitialShortcutData.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.Macro; import org.l2jmobius.gameserver.model.MacroCmd; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index c77b1559e7..7e4d3ca9a8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -33,11 +33,11 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.CrystallizationType; import org.l2jmobius.gameserver.model.holders.CrystallizationDataHolder; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java index 624a8754f5..9644699cc0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/LimitShopCraftData.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.LimitShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius, GustavoFonseca diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java index 11000be2bb..826ff206e4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/LimitShopData.java @@ -30,7 +30,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.LimitShopProductHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mobius diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 4b12989a98..73914d140e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -44,8 +44,8 @@ import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.MultisellListHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantItemGroup; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantItemGroup; import org.l2jmobius.gameserver.network.serverpackets.MultiSellList; public class MultisellData implements IXmlReader diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java index b1f1f7ff51..9d8e3a9bf3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/PrimeShopData.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.primeshop.PrimeShopGroup; import org.l2jmobius.gameserver.model.primeshop.PrimeShopItem; import org.l2jmobius.gameserver.network.serverpackets.primeshop.ExBRProductInfo; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/RandomCraftData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/RandomCraftData.java index 57122b712d..2914ecf635 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/RandomCraftData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/RandomCraftData.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.RandomCraftExtractDataHolder; import org.l2jmobius.gameserver.model.holders.RandomCraftRewardDataHolder; import org.l2jmobius.gameserver.model.holders.RandomCraftRewardItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Mode, Mobius diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 0cb9fed9fa..e07f7d9f64 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -51,7 +51,7 @@ import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.PlayerSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/VariationData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/VariationData.java index 392612cd2d..c29a10baa2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/VariationData.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/VariationData.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.l2jmobius.commons.util.IXmlReader; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.VariationInstance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.OptionDataCategory; import org.l2jmobius.gameserver.model.options.OptionDataGroup; import org.l2jmobius.gameserver.model.options.Options; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/CrystallizationType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/CrystallizationType.java index 1b5d73308d..4ed0600683 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/CrystallizationType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/CrystallizationType.java @@ -16,9 +16,9 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; /** * @author Nik diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/ItemGrade.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/ItemGrade.java index 5f4cf681f2..5ddd52339d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/ItemGrade.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/ItemGrade.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.enums; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/handler/IItemHandler.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/handler/IItemHandler.java index 38640754d8..b8794e4824 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/handler/IItemHandler.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/handler/IItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.logging.Logger; import org.l2jmobius.gameserver.model.actor.Playable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Mother class of all Item Handlers. diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/handler/ItemHandler.java index a815f2646e..2e607fb862 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.handler; import java.util.HashMap; import java.util.Map; -import org.l2jmobius.gameserver.model.items.EtcItem; +import org.l2jmobius.gameserver.model.item.EtcItem; /** * This class manages handlers of items diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java index 9925d2c037..d8f8812da0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.clan.ClanMember; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; public class CastleManager diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 179b4467c3..2ce3e815cc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.model.actor.instance.FeedableBeast; import org.l2jmobius.gameserver.model.actor.instance.FortCommander; import org.l2jmobius.gameserver.model.actor.instance.GrandBoss; import org.l2jmobius.gameserver.model.actor.instance.Guard; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.util.Broadcast; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d4517ad572..a9f8ced91b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.FortSiegeSpawn; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.siege.FortSiege; import org.l2jmobius.gameserver.model.skills.CommonSkill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 4dcb5c4bf9..b5a0a94918 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -43,10 +43,10 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.CommissionManager; import org.l2jmobius.gameserver.model.commission.CommissionItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionBuyItem; import org.l2jmobius.gameserver.network.serverpackets.commission.ExResponseCommissionDelete; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index d70b04f622..5422eeb2e0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -31,7 +31,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.taskmanager.ItemsAutoDestroyTaskManager; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java index 11220499cf..d5b8557f68 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java @@ -35,9 +35,9 @@ import org.l2jmobius.gameserver.model.TempItem; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.RecipeHolder; import org.l2jmobius.gameserver.model.holders.RecipeStatHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java index 2cada391f8..ede8494376 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/SellBuffsManager.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.handler.CommunityBoardHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SellBuffHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index 4c7dc261e3..0e766ab3bd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Defender; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.SiegeGuardHolder; import org.l2jmobius.gameserver.model.interfaces.IPositionable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java index ce03808800..7799768d15 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.AbstractZoneSettings; import org.l2jmobius.gameserver.model.zone.ZoneForm; import org.l2jmobius.gameserver.model.zone.ZoneRegion; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java index ee518f7b1c..688642da33 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/games/BlockChecker.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Block; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ArmorSet.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ArmorSet.java index 2a57f20a10..6b504526ef 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ArmorSet.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ArmorSet.java @@ -24,9 +24,9 @@ import java.util.function.Function; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/CombatFlag.java index e726f912f1..e0487f9079 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 141e0af973..94118c482b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -35,8 +35,8 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.INamable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ItemInfo.java index d96a043814..6787a5376b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.PetEvolveHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Get all information from Item to generate ItemInfo. diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Message.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Message.java index a6e62b8f21..2cb7e77ecf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Message.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Message.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.MailManager; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author Migi, DS diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Party.java index ba7db00a30..8d9082211b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Party.java @@ -46,8 +46,8 @@ import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAskModifyPartyLooting; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Seed.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Seed.java index 28b0e9962c..69b67f8b03 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Seed.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/Seed.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; public class Seed { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ShortCuts.java index d199976edc..a9fd529ecc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ShortCuts.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ShortCuts.java @@ -29,8 +29,8 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ShortcutType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.interfaces.IRestorable; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TempItem.java index c16c94509e..25bb606782 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TempItem.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Class explanation:
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TimeStamp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TimeStamp.java index 92e552ca69..335d814636 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TimeStamp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TimeStamp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TradeItem.java index 2fee1b22b4..adc501d705 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -22,8 +22,8 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class TradeItem { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TradeList.java index bbafcb1416..bea714862c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TradeList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/TradeList.java @@ -28,9 +28,9 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreBuyingResult; import org.l2jmobius.gameserver.network.serverpackets.ExPrivateStoreSellingResult; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 1b67e36b38..e3fa12532b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -67,8 +67,8 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableAttac import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnAttackableKill; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java index b22cd5cc10..1693edd262 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -116,12 +116,12 @@ import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IDeletable; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.interfaces.ISkillsHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.AbnormalType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Npc.java index a4e8e31909..53789c66e4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -75,8 +75,8 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.quest.QuestTimer; import org.l2jmobius.gameserver.model.residences.ClanHall; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Playable.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Playable.java index e55f50d031..57610596b6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Playable.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Playable.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.EtcStatusUpdate; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java index f7555fc73a..7df8c2c1ac 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -249,6 +249,15 @@ import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.holders.TrainingHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Henna; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; @@ -256,15 +265,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRandomCraft; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Henna; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.matching.MatchingRoom; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Summon.java index 7d7f9e8ea0..2e33c6270e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -47,11 +47,11 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerSummonSpawn; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Vehicle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Vehicle.java index a09253ea49..39d1ff6d93 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Vehicle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Vehicle.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.stat.VehicleStat; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneRegion; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Block.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Block.java index ce89e27407..74ecbd67e0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Block.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Block.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.ArenaParticipantsHolder; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameChangePoints; import org.l2jmobius.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java index 74e4eb2afa..42c2879ee9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.CharInfo; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Door.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Door.java index 5689ec4031..7a2fd51c0c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Door.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Door.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.status.DoorStatus; import org.l2jmobius.gameserver.model.actor.templates.DoorTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java index ab178302f7..11460dfd36 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Monster.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.util.MinionList; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index c6c08e5893..2f789753be 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -62,11 +62,11 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.stat.PetStat; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.holders.PetEvolveHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.EffectScope; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java index a30daaaa95..66d6c903e4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/RaceManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.games.MonsterRace.RaceState; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java index 02079f3d15..8aaf3eef72 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/StaticObject.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.stat.StaticObjectStat; import org.l2jmobius.gameserver.model.actor.status.StaticObjectStatus; import org.l2jmobius.gameserver.model.actor.templates.CreatureTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.serverpackets.ShowTownMap; import org.l2jmobius.gameserver.network.serverpackets.StaticObjectInfo; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java index 1f41555362..1a1382d64d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeast.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java index 5cab0f8c31..80b209f216 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Trap.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnTrapAction; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadGameManager; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java index 0a05e6f25d..e1eb95fedd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/CompoundRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java index fcb92ed658..ceab12a516 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemAttributeRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java index 2f57efd4a6..b79ab53e03 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/EnchantItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java index 48bee4f8f2..69246e11a4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/request/ShapeShiftingItemRequest.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.actor.request; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Sdw diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java index ebce1675a6..2367cbb941 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/CreatureStat.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.Position; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.effects.AbstractEffect; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index fdba2945a9..6f5734a1d7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayableExpChanged; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 6e4bcf98c1..a191dfbab5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SubClassHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java index bb173dfb6a..71ef076212 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/tasks/player/PetFeedTask.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 29208b2b65..8e5328b099 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -23,7 +23,7 @@ import java.util.Map; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.events.ListenersContainer; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index a909041435..d9b47053dc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -40,8 +40,8 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.holders.DropHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index bb7418d57e..23870b2334 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index fc19bcbdef..6faefa8b48 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.holders.AdditionalItemHolder; import org.l2jmobius.gameserver.model.holders.AdditionalSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/buylist/Product.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/buylist/Product.java index 1accb53335..65beecb533 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/buylist/Product.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/buylist/Product.java @@ -26,8 +26,8 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.taskmanager.BuyListTaskManager; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java index 1dd3f26e8a..224329f48b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/commission/CommissionItem.java @@ -21,7 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.concurrent.ScheduledFuture; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author NosBit, Ren diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/Condition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/Condition.java index 0f35663ea9..2f11aca842 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/Condition.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/Condition.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java index 8e36905ee3..818194cf5d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionCategoryType.java @@ -20,7 +20,7 @@ import java.util.Set; import org.l2jmobius.gameserver.enums.CategoryType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java index 0bf36903c6..abe0c0a2ad 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java index 605303bb41..aa309c4a95 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionGameChance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java index 3645903f33..e40e643b02 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionGameTime.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java index 3b8d456b4a..9e8dd2b6b5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionInventory.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java index f1a8c9f654..0606d2ee0d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionItemId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java index f30d06f07f..8cdf6c0f9f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicAnd.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java index c7756bc94f..846e238424 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java index 2f59125c9e..d9930be741 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionLogicOr.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java index 8e14e08cee..743afb7b9b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionMinDistance.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.geoengine.GeoEngine; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java index dd0da1b4e5..0983223920 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 5a04c46694..c26a79aebf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java index e55c84f5cd..358a2e8501 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java index 33ec46daba..65d65cf5b7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerAgathionId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java index 4e80c3c5a1..8744d39c20 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 3757066e76..070c674fe0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index 9f908898ea..ebdbe02899 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index d60e1343b9..1f55ed1bae 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index 37b9ff623f..45f961dfc4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java index 3f6b6240a9..9fe1b70d34 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.ControllableAirShip; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 5e60eaf6e6..a2e2edaca2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Siege; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index e378226f6c..b63009539a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.data.sql.CharSummonTable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java index 0c03693511..c98f5961ff 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index 731c6e6b28..b9db9c3dd6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 3a5f6e17f4..e25bf69d06 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Attackable; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java index 25d5e3b80b..bd71a061bf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSwitchSubclass.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectFlag; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java index 2e75866e00..0b472089a8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index fcd8e14da5..2613a1847b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 7545752320..3f9d106765 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index e3abb9a67e..94d1255451 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java index 901f485b6c..30d4301e6a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCharges.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 1c81382de5..572e3f3d57 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index f0ef17cca4..f0f2297ca6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java index f9bd6f8375..83741a3a8f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCloakStatus.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java index c04760b409..d57da10ebf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java index 85cda72c01..4b4fb965e5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerDualclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; public class ConditionPlayerDualclass extends Condition diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java index 43a8dfbd70..9b20f31c36 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerFlyMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java index 2585519bd3..54b54c4d9a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasCastle.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index a1df1ffea3..15a2e473cc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java index 69e633a72c..31cf90fe63 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFort.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java index 5051215fd1..7581dc20e7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java index b778a112b9..e6ea3ab07d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasFreeTeleportBookmarkSlots.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java index 36c8572836..8fa1f819e2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasPet.java @@ -21,8 +21,8 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java index eca380d90a..765eec9326 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHasSummon.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java index 8e624415aa..4189e6a375 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerHp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java index daf51157fd..5719e914b6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java index 35ef19a466..48cd0f6835 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInInstance.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java index df8f43bf14..09b10bf48a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInsideZoneId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index ec9e9356e1..4e3d31db0a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index a76d7a05c6..a78dd05e02 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java index 161c093304..6a23b63217 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsClanLeader.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java index adcbc5c979..49f1e6c719 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsHero.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java index 8c074e0a03..7e2843a1b4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java index edfdd28a12..19822beab7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsOnSide.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.CastleSide; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java index 9c76cd8866..8d7c1bf13d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerIsPvpFlagged.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java index b964fc4e75..71037683bf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLandingZone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java index 03e4a3b582..1b88301afc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 78412ceb11..6a070ea896 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java index de5912b530..aa66805068 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerMp.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java index d749c0759c..4d8b941308 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPkCount.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index d33ef270b7..b2c5a9352d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java index eaded34724..d45cd834df 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java index 903bd3af2a..5f2901a564 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java index 5d0789f564..af2a5d53fe 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromSummonedNpc.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java index 9c6adcec03..33ea2ca72f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerServitorNpcId.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java index d23a8d53eb..9a80798e09 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSex.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java index 7660209cc4..42e22c393a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSiegeSide.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java index fc9320c7a7..5ccfc2ab1d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSouls.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.SoulType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index 9ee6a07aa3..c9d014d169 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java index 9467ece318..ecbdf5ac00 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerSubclass.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java index 00c1f6a09e..86f15936c5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java index 8fa01de533..d8c48664d6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerVehicleMounted.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 6ab341e1bf..1601663943 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index ee0fa26fcd..c9e458dde2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.FortManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index 5f800cd604..c5a1ca7f70 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 3e2d15f99c..534efa3821 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java index f475306518..703290d960 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAbnormalType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java index 72548a1deb..16ff551261 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveEffectId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java index ed2485c396..acf13f3064 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 5a72f550d0..dbc4595167 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java index 4de89dbe24..4c4d5c0bf9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetCheckCrtEffect.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 0919176e56..d5e4753086 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java index 8903b19e45..7c307d5ed4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java index 6bfcea6b35..b8871f9f46 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 70d17a8c39..e812326b15 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index c94ea8a17b..9c8cce3182 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index a5f2671f8e..ce37fafd5e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java index a7e1f3dfb5..1a1f5a858f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.conditions; import java.util.List; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java index d0db20fe95..8f7303da7a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcType.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 241622ae77..a915cb42e8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java index 2c3693a645..bc72963549 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetPlayer.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java index 5686167d3e..55559bfe4d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetRace.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java index a67123123d..952d201940 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java @@ -17,8 +17,8 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index 253706eb86..7d6ff85125 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index a5fea7c6f6..347f281026 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -17,10 +17,10 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java index 35586599b9..05db6710a7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java index e0693d0b11..a1b2913663 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java index be5bdd9f34..83d77138b1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionWithSkill.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.model.conditions; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java index 539accce38..8b6b267f09 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java index 31fc2b0c21..f670bb4c34 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ensoul/EnsoulFee.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index ea0cef1aee..9fa5d2bdad 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -130,15 +130,15 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate; import org.l2jmobius.gameserver.model.interfaces.IPositionable; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.Mail; import org.l2jmobius.gameserver.model.itemcontainer.PetInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.model.siege.Fort; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java index d2098a6c93..daabeb125d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerAugment.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java index 91f10ca728..e9a593c948 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemAdd.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java index 7fbc5a9c65..4f3fca450e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemDestroy.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java index 77bd42abb8..d99db91092 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerClanWHItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java index 35cf20a646..db4a7a22ad 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java index a9b1aeecdd..cc6c488305 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerHennaRemove.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java index 2dd6858652..204ae21419 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemAdd.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java index 8d2db9a894..227d4a80f6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDestroy.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java index 01e684230e..b777884a55 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemDrop.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java index a555762241..259c59aa7a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemEquip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java index f361110aba..9f506bb1fe 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemPickup.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java index fe0bf25212..c81b118018 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemTransfer.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java index 2abcce29fe..e06d7a838e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/creature/player/OnPlayerItemUnequip.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.creature.player; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java index e44388dad8..c9a6961627 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemBypassEvent.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java index 68dab3e759..eea61be8a6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemCreate.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java index e7904b47eb..dd5489d0fb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/events/impl/item/OnItemTalk.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.events.impl.item; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.IBaseEvent; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/fishing/Fishing.java index e202b08913..3e94350ad8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/fishing/Fishing.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/fishing/Fishing.java @@ -32,9 +32,9 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerFishing; import org.l2jmobius.gameserver.model.interfaces.ILocational; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.model.zone.ZoneType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java index 79c69f739d..41f554b9e0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/AppearanceHolder.java @@ -18,11 +18,11 @@ package org.l2jmobius.gameserver.model.holders; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceHandType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceMagicType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceHandType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceMagicType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; /** * @author Sdw diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java index b86121305d..b18ff0fce9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/ArmorsetSkillHolder.java @@ -20,7 +20,7 @@ import java.util.function.Function; import org.l2jmobius.gameserver.model.ArmorSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index 6fd5c1342c..cf692041e0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; /** * @author Nik diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java index e1974f9a90..3d4fbcceb9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/PetItemHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java index 3701c1e98d..f0ad87cd5a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/PreparedMultisellListHolder.java @@ -22,9 +22,9 @@ import java.util.List; import org.l2jmobius.gameserver.enums.TaxType; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * A modified version of {@link MultisellListHolder} that may include altered data of the original and other dynamic data resulted from players' interraction. diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java index 294d857c75..545236e9e8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/SkillUseHolder.java @@ -16,7 +16,7 @@ */ package org.l2jmobius.gameserver.model.holders; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/Armor.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/Armor.java new file mode 100644 index 0000000000..f65945c191 --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/Armor.java @@ -0,0 +1,92 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.ArmorType; + +/** + * This class is dedicated to the management of armors. + */ +public class Armor extends ItemTemplate +{ + private ArmorType _type; + + /** + * Constructor for Armor. + * @param set the StatSet designating the set of couples (key,value) characterizing the armor. + */ + public Armor(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); + + final long bodyPart = getBodyPart(); + if ((bodyPart == ItemTemplate.SLOT_ARTIFACT) || (bodyPart == ItemTemplate.SLOT_AGATHION)) + { + _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; + _type2 = ItemTemplate.TYPE2_ACCESSORY; + } + else if ((bodyPart == ItemTemplate.SLOT_NECK) || ((bodyPart & ItemTemplate.SLOT_L_EAR) != 0) || ((bodyPart & ItemTemplate.SLOT_L_FINGER) != 0) || ((bodyPart & ItemTemplate.SLOT_R_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_L_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_ARTIFACT_BOOK) != 0)) + { + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_ACCESSORY; + } + else + { + if ((_type == ArmorType.NONE) && (getBodyPart() == ItemTemplate.SLOT_L_HAND)) + { + _type = ArmorType.SHIELD; + } + _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; + _type2 = ItemTemplate.TYPE2_SHIELD_ARMOR; + } + } + + /** + * @return the type of the armor. + */ + @Override + public ArmorType getItemType() + { + return _type; + } + + /** + * @return the ID of the item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an armor, {@code false} otherwise + */ + @Override + public boolean isArmor() + { + return true; + } +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/EtcItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/EtcItem.java new file mode 100644 index 0000000000..aada2ffd22 --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/EtcItem.java @@ -0,0 +1,156 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.List; + +import org.l2jmobius.gameserver.model.ExtractableProduct; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.itemcontainer.Inventory; + +/** + * This class is dedicated to the management of EtcItem. + */ +public class EtcItem extends ItemTemplate +{ + private String _handler; + private EtcItemType _type; + private List _extractableItems; + private int _extractableCountMin; + private int _extractableCountMax; + private boolean _isInfinite; + + /** + * Constructor for EtcItem. + * @param set StatSet designating the set of couples (key,value) for description of the Etc + */ + public EtcItem(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); + _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; + _type2 = ItemTemplate.TYPE2_OTHER; // default is other + + if (isQuestItem()) + { + _type2 = ItemTemplate.TYPE2_QUEST; + } + else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) + { + _type2 = ItemTemplate.TYPE2_MONEY; + } + + _handler = set.getString("handler", null); // ! null ! + + _extractableCountMin = set.getInt("extractableCountMin", 0); + _extractableCountMax = set.getInt("extractableCountMax", 0); + if (_extractableCountMin > _extractableCountMax) + { + LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); + } + + _isInfinite = set.getBoolean("is_infinite", false); + } + + /** + * @return the type of Etc Item. + */ + @Override + public EtcItemType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is an etc item, {@code false} otherwise. + */ + @Override + public boolean isEtcItem() + { + return true; + } + + /** + * @return the handler name, null if no handler for item. + */ + public String getHandlerName() + { + return _handler; + } + + /** + * @return the extractable items list. + */ + public List getExtractableItems() + { + return _extractableItems; + } + + /** + * @return the minimum count of extractable items + */ + public int getExtractableCountMin() + { + return _extractableCountMin; + } + + /** + * @return the maximum count of extractable items + */ + public int getExtractableCountMax() + { + return _extractableCountMax; + } + + /** + * @return true if item is infinite + */ + public boolean isInfinite() + { + return _isInfinite; + } + + /** + * @param extractableProduct + */ + @Override + public void addCapsuledItem(ExtractableProduct extractableProduct) + { + if (_extractableItems == null) + { + _extractableItems = new ArrayList<>(); + } + _extractableItems.add(extractableProduct); + } +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/Henna.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/Henna.java new file mode 100644 index 0000000000..d029309b0f --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/Henna.java @@ -0,0 +1,171 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.l2jmobius.gameserver.enums.ClassId; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.BaseStat; + +/** + * Class for the Henna object. + * @author Zoey76 + */ +public class Henna +{ + private final int _dyeId; + private final int _dyeItemId; + private final Map _baseStats = new HashMap<>(); + private final int _wearFee; + private final int _wearCount; + private final int _cancelFee; + private final int _cancelCount; + private final int _duration; + private final List _skills; + private final List _wearClass; + + public Henna(StatSet set) + { + _dyeId = set.getInt("dyeId"); + _dyeItemId = set.getInt("dyeItemId"); + _baseStats.put(BaseStat.STR, set.getInt("str", 0)); + _baseStats.put(BaseStat.CON, set.getInt("con", 0)); + _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); + _baseStats.put(BaseStat.INT, set.getInt("int", 0)); + _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); + _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); + _wearFee = set.getInt("wear_fee"); + _wearCount = set.getInt("wear_count"); + _cancelFee = set.getInt("cancel_fee"); + _cancelCount = set.getInt("cancel_count"); + _duration = set.getInt("duration", -1); + _skills = new ArrayList<>(); + _wearClass = new ArrayList<>(); + } + + /** + * @return the dye Id. + */ + public int getDyeId() + { + return _dyeId; + } + + /** + * @return the item Id, required for this dye. + */ + public int getDyeItemId() + { + return _dyeItemId; + } + + public int getBaseStats(BaseStat stat) + { + return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); + } + + public Map getBaseStats() + { + return _baseStats; + } + + /** + * @return the wear fee, cost for adding this dye to the player. + */ + public int getWearFee() + { + return _wearFee; + } + + /** + * @return the wear count, the required count to add this dye to the player. + */ + public int getWearCount() + { + return _wearCount; + } + + /** + * @return the cancel fee, cost for removing this dye from the player. + */ + public int getCancelFee() + { + return _cancelFee; + } + + /** + * @return the cancel count, the retrieved amount of dye items after removing the dye. + */ + public int getCancelCount() + { + return _cancelCount; + } + + /** + * @return the duration of this dye. + */ + public int getDuration() + { + return _duration; + } + + /** + * @param skillList the list of skills related to this dye. + */ + public void setSkills(List skillList) + { + _skills.addAll(skillList); + } + + /** + * @return the skills related to this dye. + */ + public List getSkills() + { + return _skills; + } + + /** + * @return the list with the allowed classes to wear this dye. + */ + public List getAllowedWearClass() + { + return _wearClass; + } + + /** + * @param classId the class trying to wear this dye. + * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. + */ + public boolean isAllowedClass(ClassId classId) + { + return _wearClass.contains(classId); + } + + /** + * @param wearClassIds the list of classes that can wear this dye. + */ + public void setWearClassIds(List wearClassIds) + { + _wearClass.addAll(wearClassIds); + } +} \ No newline at end of file diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java similarity index 94% rename from L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java rename to L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java index 56b14ad5c7..76131b3078 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/ItemTemplate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/ItemTemplate.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.ArrayList; import java.util.Arrays; @@ -42,12 +42,12 @@ import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.events.ListenersContainer; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; -import org.l2jmobius.gameserver.model.items.type.MaterialType; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; +import org.l2jmobius.gameserver.model.item.type.MaterialType; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncAdd; import org.l2jmobius.gameserver.model.stats.functions.FuncSet; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java new file mode 100644 index 0000000000..e9aa728f69 --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/PlayerItemTemplate.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author Zoey76 + */ +public class PlayerItemTemplate extends ItemHolder +{ + private final boolean _equipped; + + /** + * @param set the set containing the values for this object + */ + public PlayerItemTemplate(StatSet set) + { + super(set.getInt("id"), set.getInt("count")); + _equipped = set.getBoolean("equipped", false); + } + + /** + * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise + */ + public boolean isEquipped() + { + return _equipped; + } +} \ No newline at end of file diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java similarity index 91% rename from L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java rename to L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index 5b9babb699..909b5453b2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/WarehouseItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items; +package org.l2jmobius.gameserver.model.item; import java.util.Collection; import java.util.Objects; @@ -22,9 +22,9 @@ import java.util.Objects; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * This class contains Item
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/Weapon.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/Weapon.java new file mode 100644 index 0000000000..4599d5047f --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/Weapon.java @@ -0,0 +1,311 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item; + +import org.l2jmobius.commons.util.Rnd; +import org.l2jmobius.gameserver.enums.ItemSkillType; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.World; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.events.EventDispatcher; +import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.stats.Formulas; +import org.l2jmobius.gameserver.network.SystemMessageId; +import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; +import org.l2jmobius.gameserver.util.Util; + +/** + * This class is dedicated to the management of weapons. + */ +public class Weapon extends ItemTemplate +{ + private WeaponType _type; + private boolean _isMagicWeapon; + private int _soulShotCount; + private int _spiritShotCount; + private int _mpConsume; + private int _baseAttackRange; + private int _baseAttackRadius; + private int _baseAttackAngle; + private int _changeWeaponId; + + private int _reducedSoulshot; + private int _reducedSoulshotChance; + + private int _reducedMpConsume; + private int _reducedMpConsumeChance; + + private boolean _isForceEquip; + private boolean _isAttackWeapon; + private boolean _useWeaponSkillsOnly; + + /** + * Constructor for Weapon. + * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. + */ + public Weapon(StatSet set) + { + super(set); + } + + @Override + public void set(StatSet set) + { + super.set(set); + _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); + _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; + _type2 = ItemTemplate.TYPE2_WEAPON; + _isMagicWeapon = set.getBoolean("is_magic_weapon", false); + _soulShotCount = set.getInt("soulshots", 0); + _spiritShotCount = set.getInt("spiritshots", 0); + _mpConsume = set.getInt("mp_consume", 0); + _baseAttackRange = set.getInt("attack_range", 40); + final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle + if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) + { + _baseAttackRadius = Integer.parseInt(damageRange[2]); + _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); + } + else + { + _baseAttackRadius = 40; + _baseAttackAngle = 240; // 360 - 120 + } + + final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); + _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; + _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; + + final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); + _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; + _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; + _changeWeaponId = set.getInt("change_weaponId", 0); + _isForceEquip = set.getBoolean("isForceEquip", false); + _isAttackWeapon = set.getBoolean("isAttackWeapon", true); + _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); + } + + /** + * @return the type of Weapon + */ + @Override + public WeaponType getItemType() + { + return _type; + } + + /** + * @return the ID of the Etc item after applying the mask. + */ + @Override + public int getItemMask() + { + return _type.mask(); + } + + /** + * @return {@code true} if the item is a weapon, {@code false} otherwise. + */ + @Override + public boolean isWeapon() + { + return true; + } + + /** + * @return {@code true} if the weapon is magic, {@code false} otherwise. + */ + @Override + public boolean isMagicWeapon() + { + return _isMagicWeapon; + } + + /** + * @return the quantity of SoulShot used. + */ + public int getSoulShotCount() + { + return _soulShotCount; + } + + /** + * @return the quantity of SpiritShot used. + */ + public int getSpiritShotCount() + { + return _spiritShotCount; + } + + /** + * @return the reduced quantity of SoultShot used. + */ + public int getReducedSoulShot() + { + return _reducedSoulshot; + } + + /** + * @return the chance to use Reduced SoultShot. + */ + public int getReducedSoulShotChance() + { + return _reducedSoulshotChance; + } + + /** + * @return the MP consumption with the weapon. + */ + public int getMpConsume() + { + return _mpConsume; + } + + public int getBaseAttackRange() + { + return _baseAttackRange; + } + + public int getBaseAttackRadius() + { + return _baseAttackRadius; + } + + public int getBaseAttackAngle() + { + return _baseAttackAngle; + } + + /** + * @return the reduced MP consumption with the weapon. + */ + public int getReducedMpConsume() + { + return _reducedMpConsume; + } + + /** + * @return the chance to use getReducedMpConsume() + */ + public int getReducedMpConsumeChance() + { + return _reducedMpConsumeChance; + } + + /** + * @return the Id in which weapon this weapon can be changed. + */ + public int getChangeWeaponId() + { + return _changeWeaponId; + } + + /** + * @return {@code true} if the weapon is force equip, {@code false} otherwise. + */ + public boolean isForceEquip() + { + return _isForceEquip; + } + + /** + * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. + */ + public boolean isAttackWeapon() + { + return _isAttackWeapon; + } + + /** + * @return {@code true} if the weapon is skills only, {@code false} otherwise. + */ + public boolean useWeaponSkillsOnly() + { + return _useWeaponSkillsOnly; + } + + /** + * @param caster the Creature pointing out the caster + * @param target the Creature pointing out the target + * @param trigger + * @param type + */ + public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) + { + forEachSkill(type, holder -> + { + final Skill skill = holder.getSkill(); + if (Rnd.get(100) >= holder.getChance()) + { + return; + } + + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // Trigger only if both are good or bad magic. + if (trigger.isBad() != skill.isBad()) + { + return; + } + + // No Trigger if not Magic Skill or is toggle + if (trigger.isMagic() != skill.isMagic()) + { + return; + } + + // No Trigger if skill is toggle + if (trigger.isToggle()) + { + return; + } + + if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) + { + return; + } + } + + // Skill condition not met + if (!skill.checkCondition(caster, target, true)) + { + return; + } + + skill.activateSkill(caster, target); + + // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! + if (type == ItemSkillType.ON_MAGIC_SKILL) + { + // notify quests of a skill use + if (caster.isPlayer()) + { + World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); + } + if (caster.isPlayer()) + { + final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); + sm.addSkillName(skill); + caster.sendPacket(sm); + } + } + }); + } +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java new file mode 100644 index 0000000000..539c32ff6f --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceHandType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceHandType +{ + NONE, + ONE_HANDED, + TWO_HANDED, +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java new file mode 100644 index 0000000000..a1b472975a --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceMagicType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceMagicType +{ + NONE, + MAGICAL, + PHYISICAL, +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java new file mode 100644 index 0000000000..610e720125 --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -0,0 +1,558 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.data.ItemTable; +import org.l2jmobius.gameserver.enums.Race; +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; +import org.l2jmobius.gameserver.network.SystemMessageId; + +/** + * @author UnAfraid + */ +public class AppearanceStone +{ + private final int _id; + private final int _cost; + private final int _visualId; + private final long _lifeTime; + private final AppearanceType _type; + private final WeaponType _weaponType; + private final ArmorType _armorType; + private final AppearanceHandType _handType; + private final AppearanceMagicType _magicType; + private List _crystalTypes; + private List _targetTypes; + private List _bodyParts; + private List _races; + private List _racesNot; + private List _allVisualIds; + + public AppearanceStone(StatSet set) + { + _id = set.getInt("id"); + _visualId = set.getInt("visualId", 0); + _cost = set.getInt("cost", 0); + _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); + _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); + _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); + _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); + _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); + _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); + + final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); + if (targetType != AppearanceTargetType.NONE) + { + addTargetType(targetType); + } + + // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. + final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); + + // If no crystal type is defined, we must add all defaults. + if (crystalType == null) + { + switch (targetType) + { + case ACCESSORY: + case ALL: + { + addCrystalType(CrystalType.NONE); + // fallthrough + } + case WEAPON: + case ARMOR: + { + for (CrystalType cryType : CrystalType.values()) + { + if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) + { + addCrystalType(cryType); + } + } + } + } + } + else + { + addCrystalType(crystalType); + } + + final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); + if (bodyPart != ItemTemplate.SLOT_NONE) + { + addBodyPart(bodyPart); + } + + final Race race = set.getEnum("race", Race.class, Race.NONE); + if (race != Race.NONE) + { + addRace(race); + } + + final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); + if (raceNot != Race.NONE) + { + addRaceNot(raceNot); + } + } + + public int getId() + { + return _id; + } + + public int getVisualId() + { + return _visualId; + } + + public int getCost() + { + return _cost; + } + + public long getLifeTime() + { + return _lifeTime; + } + + public AppearanceType getType() + { + return _type; + } + + public WeaponType getWeaponType() + { + return _weaponType; + } + + public ArmorType getArmorType() + { + return _armorType; + } + + public AppearanceHandType getHandType() + { + return _handType; + } + + public AppearanceMagicType getMagicType() + { + return _magicType; + } + + public void addCrystalType(CrystalType type) + { + if (_crystalTypes == null) + { + _crystalTypes = new ArrayList<>(); + } + _crystalTypes.add(type); + } + + public List getCrystalTypes() + { + return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); + } + + public void addTargetType(AppearanceTargetType type) + { + if (_targetTypes == null) + { + _targetTypes = new ArrayList<>(); + } + _targetTypes.add(type); + } + + public List getTargetTypes() + { + return _targetTypes != null ? _targetTypes : Collections.emptyList(); + } + + public void addBodyPart(long part) + { + if (_bodyParts == null) + { + _bodyParts = new ArrayList<>(); + } + _bodyParts.add(part); + } + + public void addVisualId(AppearanceHolder appearanceHolder) + { + if (_allVisualIds == null) + { + _allVisualIds = new ArrayList<>(); + } + _allVisualIds.add(appearanceHolder); + } + + public List getVisualIds() + { + return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); + } + + public List getBodyParts() + { + return _bodyParts != null ? _bodyParts : Collections.emptyList(); + } + + public void addRace(Race race) + { + if (_races == null) + { + _races = new ArrayList<>(); + } + _races.add(race); + } + + public List getRaces() + { + return _races != null ? _races : Collections.emptyList(); + } + + public void addRaceNot(Race race) + { + if (_racesNot == null) + { + _racesNot = new ArrayList<>(); + } + _racesNot.add(race); + } + + public List getRacesNot() + { + return _racesNot != null ? _racesNot : Collections.emptyList(); + } + + /** + * @param player the actor requesting to use this appearance. + * @param targetItem the item to be modified with this appearance. + * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. + */ + public boolean checkConditions(Player player, Item targetItem) + { + if (targetItem == null) + { + return false; + } + + if (getTargetTypes().isEmpty()) + { + return false; + } + + if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); + return false; + } + + switch (_type) + { + case RESTORE: + { + if (targetItem.getVisualId() == 0) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); + return false; + } + + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + default: + { + // Seems like in retail item with already changed appearance, can be changed again without being restored. + + final AppearanceTargetType targetType = getTargetTypes().get(0); + switch (targetType) + { + case NONE: + { + return false; + } + case WEAPON: + { + if (!targetItem.isWeapon()) + { + player.sendPacket(SystemMessageId.WEAPONS_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ARMOR: + { + if (!targetItem.isArmor()) + { + player.sendPacket(SystemMessageId.ARMOR_ONLY); + return false; + } + + if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); + return false; + } + break; + } + case ACCESSORY: + { + if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + { + player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); + return false; + } + break; + } + case ALL: + { + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (findVisualChange(targetItem) == null) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + return true; + } + } + break; + } + } + + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + + if (_weaponType != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) + { + if (_weaponType != WeaponType.CROSSBOW) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); + return false; + } + } + + switch (_handType) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + } + + switch (_magicType) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + if (_armorType != ArmorType.NONE) + { + switch (_armorType) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); + return false; + } + } + } + } + + return true; + } + + public AppearanceHolder findVisualChange(Item targetItem) + { + for (AppearanceHolder holder : _allVisualIds) + { + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + { + continue; + } + + if (holder.getWeaponType() != WeaponType.NONE) + { + if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) + { + if (holder.getWeaponType() != WeaponType.CROSSBOW) + { + continue; + } + else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) + { + continue; + } + } + + switch (holder.getHandType()) + { + case ONE_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + { + continue; + } + break; + } + case TWO_HANDED: + { + if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + { + continue; + } + break; + } + } + + switch (holder.getMagicType()) + { + case MAGICAL: + { + if (!targetItem.getItem().isMagicWeapon()) + { + continue; + } + break; + } + case PHYISICAL: + { + if (targetItem.getItem().isMagicWeapon()) + { + continue; + } + } + } + } + + if (holder.getArmorType() != ArmorType.NONE) + { + switch (holder.getArmorType()) + { + case SHIELD: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) + { + continue; + } + break; + } + case SIGIL: + { + if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) + { + continue; + } + } + } + } + return holder; + } + return null; + } +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java new file mode 100644 index 0000000000..a550363da5 --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceTargetType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceTargetType +{ + NONE, + WEAPON, + ARMOR, + ACCESSORY, + ALL +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java new file mode 100644 index 0000000000..a52e0900ca --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceType.java @@ -0,0 +1,29 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.appearance; + +/** + * @author UnAfraid + */ +public enum AppearanceType +{ + NONE, + NORMAL, + BLESSED, + FIXED, + RESTORE +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java similarity index 93% rename from L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java rename to L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java index 6c2b4c08a5..53b89b29bf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/combination/CombinationItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.combination; +package org.l2jmobius.gameserver.model.item.combination; import java.util.EnumMap; import java.util.Map; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java new file mode 100644 index 0000000000..dcfa1d485d --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemReward.java @@ -0,0 +1,38 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +import org.l2jmobius.gameserver.model.holders.ItemHolder; + +/** + * @author UnAfraid + */ +public class CombinationItemReward extends ItemHolder +{ + private final CombinationItemType _type; + + public CombinationItemReward(int id, int count, CombinationItemType type) + { + super(id, count); + _type = type; + } + + public CombinationItemType getType() + { + return _type; + } +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java new file mode 100644 index 0000000000..920fa01cc1 --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/combination/CombinationItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.combination; + +/** + * @author UnAfraid + */ +public enum CombinationItemType +{ + ON_SUCCESS, + ON_FAILURE; +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java similarity index 90% rename from L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java rename to L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 1e78189ef3..9cd198708e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.logging.Logger; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java new file mode 100644 index 0000000000..27d5d894bd --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantItemGroup.java @@ -0,0 +1,97 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; + +/** + * @author UnAfraid + */ +public class EnchantItemGroup +{ + private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); + private final List _chances = new ArrayList<>(); + private final String _name; + private int _maximumEnchant = -1; + + public EnchantItemGroup(String name) + { + _name = name; + } + + /** + * @return name of current enchant item group. + */ + public String getName() + { + return _name; + } + + /** + * @param holder + */ + public void addChance(RangeChanceHolder holder) + { + _chances.add(holder); + } + + /** + * @param index + * @return chance for success rate for current enchant item group. + */ + public double getChance(int index) + { + if (!_chances.isEmpty()) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getMin() <= index) && (holder.getMax() >= index)) + { + return holder.getChance(); + } + } + LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); + return _chances.get(_chances.size() - 1).getChance(); + } + LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); + return -1; + } + + /** + * @return the maximum enchant level for current enchant item group. + */ + public int getMaximumEnchant() + { + if (_maximumEnchant == -1) + { + for (RangeChanceHolder holder : _chances) + { + if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) + { + _maximumEnchant = holder.getMax(); + } + } + _maximumEnchant++; + } + return _maximumEnchant; + } +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java new file mode 100644 index 0000000000..1099b77054 --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantRateItem.java @@ -0,0 +1,91 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantRateItem +{ + private final String _name; + private int _itemId; + private long _slot; + private Boolean _isMagicWeapon = null; + + public EnchantRateItem(String name) + { + _name = name; + } + + /** + * @return name of enchant group. + */ + public String getName() + { + return _name; + } + + /** + * Adds item id verification. + * @param id + */ + public void setItemId(int id) + { + _itemId = id; + } + + /** + * Adds body slot verification. + * @param slot + */ + public void addSlot(long slot) + { + _slot |= slot; + } + + /** + * Adds magic weapon verification. + * @param magicWeapon + */ + public void setMagicWeapon(boolean magicWeapon) + { + _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; + } + + /** + * @param item + * @return {@code true} if item can be used with this rate group, {@code false} otherwise. + */ + public boolean validate(ItemTemplate item) + { + if ((_itemId != 0) && (_itemId != item.getId())) + { + return false; + } + else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) + { + return false; + } + else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) + { + return false; + } + return true; + } +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java new file mode 100644 index 0000000000..f46dd28657 --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantResultType.java @@ -0,0 +1,27 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +/** + * @author UnAfraid + */ +public enum EnchantResultType +{ + ERROR, + SUCCESS, + FAILURE +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java similarity index 93% rename from L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java rename to L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index 59f82cf9a4..d12e0b3ac9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.enchant; +package org.l2jmobius.gameserver.model.item.enchant; import java.util.HashSet; import java.util.Set; @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.stats.Stat; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java new file mode 100644 index 0000000000..e1e485672e --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScrollGroup.java @@ -0,0 +1,82 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.l2jmobius.gameserver.model.item.ItemTemplate; + +/** + * @author UnAfraid + */ +public class EnchantScrollGroup +{ + private final int _id; + private List _rateGroups; + + public EnchantScrollGroup(int id) + { + _id = id; + } + + /** + * @return id of current enchant scroll group. + */ + public int getId() + { + return _id; + } + + /** + * Adds new rate group. + * @param group + */ + public void addRateGroup(EnchantRateItem group) + { + if (_rateGroups == null) + { + _rateGroups = new ArrayList<>(); + } + _rateGroups.add(group); + } + + /** + * @return {@code List} of all enchant rate items, Empty list if none. + */ + public List getRateGroups() + { + return _rateGroups != null ? _rateGroups : Collections.emptyList(); + } + + /** + * @param item + * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. + */ + public EnchantRateItem getRateGroup(ItemTemplate item) + { + for (EnchantRateItem group : getRateGroups()) + { + if (group.validate(item)) + { + return group; + } + } + return null; + } +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java new file mode 100644 index 0000000000..bfe1c295da --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/EnchantSupportItem.java @@ -0,0 +1,57 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant; + +import org.l2jmobius.gameserver.model.StatSet; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; + +/** + * @author UnAfraid + */ +public class EnchantSupportItem extends AbstractEnchantItem +{ + private final boolean _isWeapon; + private final boolean _isBlessed; + private final boolean _isGiant; + private final ItemType type; + + public EnchantSupportItem(StatSet set) + { + super(set); + type = getItem().getItemType(); + _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); + } + + @Override + public boolean isWeapon() + { + return _isWeapon; + } + + public boolean isBlessed() + { + return _isBlessed; + } + + public boolean isGiant() + { + return _isGiant; + } +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java new file mode 100644 index 0000000000..a2f5eaffa7 --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/enchant/attribute/AttributeHolder.java @@ -0,0 +1,60 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.enchant.attribute; + +import org.l2jmobius.gameserver.enums.AttributeType; + +/** + * @author UnAfraid + */ +public class AttributeHolder +{ + private final AttributeType _type; + private int _value; + + public AttributeHolder(AttributeType type, int value) + { + _type = type; + _value = value; + } + + public AttributeType getType() + { + return _type; + } + + public int getValue() + { + return _value; + } + + public void setValue(int value) + { + _value = value; + } + + public void incValue(int with) + { + _value += with; + } + + @Override + public String toString() + { + return _type.name() + " +" + _value; + } +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/instance/Item.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/instance/Item.java similarity index 95% rename from L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/instance/Item.java rename to L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 0cb1e2777f..3a7e3c1832 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/instance/Item.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.instance; +package org.l2jmobius.gameserver.model.item.instance; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.ADENA_ID; import static org.l2jmobius.gameserver.model.itemcontainer.Inventory.MAX_ADENA; @@ -72,15 +72,15 @@ import org.l2jmobius.gameserver.model.events.impl.item.OnItemTalk; import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; import org.l2jmobius.gameserver.model.options.EnchantOptions; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.siege.Castle; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/ActionType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/ActionType.java new file mode 100644 index 0000000000..7ae67f3249 --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/ActionType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Action Type enumerated. + * @author nBd + */ +public enum ActionType +{ + CALC, + CALL_SKILL, + CAPSULE, + CREATE_MPCC, + DICE, + EQUIP, + FISHINGSHOT, + HARVEST, + HIDE_NAME, + KEEP_EXP, + NICK_COLOR, + NONE, + PEEL, + RECIPE, + SEED, + SHOW_ADVENTURER_GUIDE_BOOK, + SHOW_HTML, + SHOW_SSQ_STATUS, + SKILL_MAINTAIN, + SKILL_REDUCE, + SOULSHOT, + SPIRITSHOT, + START_QUEST, + SUMMON_SOULSHOT, + SUMMON_SPIRITSHOT, + XMAS_OPEN, + SKILL_REDUCE_ON_SKILL_SUCCESS, + SHOW_TUTORIAL +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java new file mode 100644 index 0000000000..f7789ae8e2 --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/ArmorType.java @@ -0,0 +1,51 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Armor Type enumerated. + */ +public enum ArmorType implements ItemType +{ + NONE, + LIGHT, + HEAVY, + MAGIC, + SIGIL, + + // L2J CUSTOM + SHIELD; + + final int _mask; + + /** + * Constructor of the ArmorType. + */ + ArmorType() + { + _mask = 1 << (ordinal() + WeaponType.values().length); + } + + /** + * @return the ID of the ArmorType after applying a mask. + */ + @Override + public int mask() + { + return _mask; + } +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java new file mode 100644 index 0000000000..c8a309674f --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/CrystalType.java @@ -0,0 +1,88 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Crystal Type enumerated. + * @author Adry_85 + */ +public enum CrystalType +{ + NONE(0, 0, 0, 0), + D(1, 1458, 11, 90), + C(2, 1459, 6, 45), + B(3, 1460, 11, 67), + A(4, 1461, 20, 145), + S(5, 1462, 25, 250), + S80(6, 1462, 25, 250), + S84(7, 1462, 25, 250), + R(8, 17371, 30, 500), + R95(9, 17371, 30, 500), + R99(10, 17371, 30, 500), + EVENT(11, 0, 0, 0); + + private final int _level; + private final int _crystalId; + private final int _crystalEnchantBonusArmor; + private final int _crystalEnchantBonusWeapon; + + CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) + { + _level = level; + _crystalId = crystalId; + _crystalEnchantBonusArmor = crystalEnchantBonusArmor; + _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; + } + + /** + * Gets the crystal type ID. + * @return the crystal type ID + */ + public int getLevel() + { + return _level; + } + + /** + * Gets the item ID of the crystal. + * @return the item ID of the crystal + */ + public int getCrystalId() + { + return _crystalId; + } + + public int getCrystalEnchantBonusArmor() + { + return _crystalEnchantBonusArmor; + } + + public int getCrystalEnchantBonusWeapon() + { + return _crystalEnchantBonusWeapon; + } + + public boolean isGreater(CrystalType crystalType) + { + return getLevel() > crystalType.getLevel(); + } + + public boolean isLesser(CrystalType crystalType) + { + return getLevel() < crystalType.getLevel(); + } +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java similarity index 93% rename from L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java rename to L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java index 3613e633af..b5f712627c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/EtcItemType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/EtcItemType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; /** * EtcItem Type enumerated. diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/ItemType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/ItemType.java new file mode 100644 index 0000000000..96efd315cc --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/ItemType.java @@ -0,0 +1,26 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Created for allow comparing different item types + * @author DS + */ +public interface ItemType +{ + int mask(); +} \ No newline at end of file diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java new file mode 100644 index 0000000000..20c346d197 --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/MaterialType.java @@ -0,0 +1,53 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.l2jmobius.gameserver.model.item.type; + +/** + * Material Type enumerated. + * @author Adry_85 + */ +public enum MaterialType +{ + STEEL, + FINE_STEEL, + COTTON, + BLOOD_STEEL, + BRONZE, + SILVER, + GOLD, + MITHRIL, + ORIHARUKON, + PAPER, + WOOD, + CLOTH, + LEATHER, + BONE, + HORN, + DAMASCUS, + ADAMANTAITE, + CHRYSOLITE, + CRYSTAL, + LIQUID, + SCALE_OF_DRAGON, + DYESTUFF, + COBWEB, + SEED, + FISH, + RUNE_XP, + RUNE_SP, + RUNE_REMOVE_PENALTY; +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java similarity index 94% rename from L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java rename to L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java index 74b59f572a..474f95a004 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/WeaponType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/item/type/WeaponType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.l2jmobius.gameserver.model.items.type; +package org.l2jmobius.gameserver.model.item.type; import org.l2jmobius.gameserver.model.stats.TraitType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index ef68e6d1c5..7d70f34ed8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Forsaiken diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java index 7f7ae8087c..d51a9b03d2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuction.java @@ -32,7 +32,7 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b4a47a3b1..39ad0407c8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -49,7 +49,7 @@ import org.l2jmobius.gameserver.instancemanager.ItemAuctionManager; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 3940657555..1462e18bb3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemAdd; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanWHItemTransfer; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ClanWarehouse extends Warehouse { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index a12ea3e031..a0803545c4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -54,13 +54,13 @@ import org.l2jmobius.gameserver.model.holders.AgathionSkillHolder; import org.l2jmobius.gameserver.model.holders.ArmorsetSkillHolder; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillConditionScope; import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoEquipSlot; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index 9ad623a6a7..2d1a00f461 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -34,8 +34,8 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 5c5323eaa9..90feabcfae 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index e78f33f533..3ccafd611f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -22,8 +22,8 @@ import java.util.stream.Collectors; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; public class PetInventory extends Inventory { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 512ef18689..0a83925e3c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -40,10 +40,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemAd import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDestroy; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemDrop; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerItemTransfer; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRandomCraft.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRandomCraft.java index b95eaabe63..7dea6f5049 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRandomCraft.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRandomCraft.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.data.xml.RandomCraftData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RandomCraftRequest; import org.l2jmobius.gameserver.model.holders.RandomCraftRewardItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExItemAnnounce; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java index 53e2e8e0a4..1ca009f036 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerRefund.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author DS diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/Armor.java deleted file mode 100644 index d11c43f9cc..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/Armor.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.ArmorType; - -/** - * This class is dedicated to the management of armors. - */ -public class Armor extends ItemTemplate -{ - private ArmorType _type; - - /** - * Constructor for Armor. - * @param set the StatSet designating the set of couples (key,value) characterizing the armor. - */ - public Armor(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE); - - final long bodyPart = getBodyPart(); - if ((bodyPart == ItemTemplate.SLOT_ARTIFACT) || (bodyPart == ItemTemplate.SLOT_AGATHION)) - { - _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; - _type2 = ItemTemplate.TYPE2_ACCESSORY; - } - else if ((bodyPart == ItemTemplate.SLOT_NECK) || ((bodyPart & ItemTemplate.SLOT_L_EAR) != 0) || ((bodyPart & ItemTemplate.SLOT_L_FINGER) != 0) || ((bodyPart & ItemTemplate.SLOT_R_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_L_BRACELET) != 0) || ((bodyPart & ItemTemplate.SLOT_ARTIFACT_BOOK) != 0)) - { - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_ACCESSORY; - } - else - { - if ((_type == ArmorType.NONE) && (getBodyPart() == ItemTemplate.SLOT_L_HAND)) - { - _type = ArmorType.SHIELD; - } - _type1 = ItemTemplate.TYPE1_SHIELD_ARMOR; - _type2 = ItemTemplate.TYPE2_SHIELD_ARMOR; - } - } - - /** - * @return the type of the armor. - */ - @Override - public ArmorType getItemType() - { - return _type; - } - - /** - * @return the ID of the item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an armor, {@code false} otherwise - */ - @Override - public boolean isArmor() - { - return true; - } -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/EtcItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/EtcItem.java deleted file mode 100644 index af7b9293fb..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/EtcItem.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.List; - -import org.l2jmobius.gameserver.model.ExtractableProduct; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; - -/** - * This class is dedicated to the management of EtcItem. - */ -public class EtcItem extends ItemTemplate -{ - private String _handler; - private EtcItemType _type; - private List _extractableItems; - private int _extractableCountMin; - private int _extractableCountMax; - private boolean _isInfinite; - - /** - * Constructor for EtcItem. - * @param set StatSet designating the set of couples (key,value) for description of the Etc - */ - public EtcItem(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE); - _type1 = ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA; - _type2 = ItemTemplate.TYPE2_OTHER; // default is other - - if (isQuestItem()) - { - _type2 = ItemTemplate.TYPE2_QUEST; - } - else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) - { - _type2 = ItemTemplate.TYPE2_MONEY; - } - - _handler = set.getString("handler", null); // ! null ! - - _extractableCountMin = set.getInt("extractableCountMin", 0); - _extractableCountMax = set.getInt("extractableCountMax", 0); - if (_extractableCountMin > _extractableCountMax) - { - LOGGER.warning("Item " + this + " extractableCountMin is bigger than extractableCountMax!"); - } - - _isInfinite = set.getBoolean("is_infinite", false); - } - - /** - * @return the type of Etc Item. - */ - @Override - public EtcItemType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is an etc item, {@code false} otherwise. - */ - @Override - public boolean isEtcItem() - { - return true; - } - - /** - * @return the handler name, null if no handler for item. - */ - public String getHandlerName() - { - return _handler; - } - - /** - * @return the extractable items list. - */ - public List getExtractableItems() - { - return _extractableItems; - } - - /** - * @return the minimum count of extractable items - */ - public int getExtractableCountMin() - { - return _extractableCountMin; - } - - /** - * @return the maximum count of extractable items - */ - public int getExtractableCountMax() - { - return _extractableCountMax; - } - - /** - * @return true if item is infinite - */ - public boolean isInfinite() - { - return _isInfinite; - } - - /** - * @param extractableProduct - */ - @Override - public void addCapsuledItem(ExtractableProduct extractableProduct) - { - if (_extractableItems == null) - { - _extractableItems = new ArrayList<>(); - } - _extractableItems.add(extractableProduct); - } -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/Henna.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/Henna.java deleted file mode 100644 index 09fdb7abcb..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/Henna.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.l2jmobius.gameserver.enums.ClassId; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.BaseStat; - -/** - * Class for the Henna object. - * @author Zoey76 - */ -public class Henna -{ - private final int _dyeId; - private final int _dyeItemId; - private final Map _baseStats = new HashMap<>(); - private final int _wearFee; - private final int _wearCount; - private final int _cancelFee; - private final int _cancelCount; - private final int _duration; - private final List _skills; - private final List _wearClass; - - public Henna(StatSet set) - { - _dyeId = set.getInt("dyeId"); - _dyeItemId = set.getInt("dyeItemId"); - _baseStats.put(BaseStat.STR, set.getInt("str", 0)); - _baseStats.put(BaseStat.CON, set.getInt("con", 0)); - _baseStats.put(BaseStat.DEX, set.getInt("dex", 0)); - _baseStats.put(BaseStat.INT, set.getInt("int", 0)); - _baseStats.put(BaseStat.MEN, set.getInt("men", 0)); - _baseStats.put(BaseStat.WIT, set.getInt("wit", 0)); - _wearFee = set.getInt("wear_fee"); - _wearCount = set.getInt("wear_count"); - _cancelFee = set.getInt("cancel_fee"); - _cancelCount = set.getInt("cancel_count"); - _duration = set.getInt("duration", -1); - _skills = new ArrayList<>(); - _wearClass = new ArrayList<>(); - } - - /** - * @return the dye Id. - */ - public int getDyeId() - { - return _dyeId; - } - - /** - * @return the item Id, required for this dye. - */ - public int getDyeItemId() - { - return _dyeItemId; - } - - public int getBaseStats(BaseStat stat) - { - return !_baseStats.containsKey(stat) ? 0 : _baseStats.get(stat).intValue(); - } - - public Map getBaseStats() - { - return _baseStats; - } - - /** - * @return the wear fee, cost for adding this dye to the player. - */ - public int getWearFee() - { - return _wearFee; - } - - /** - * @return the wear count, the required count to add this dye to the player. - */ - public int getWearCount() - { - return _wearCount; - } - - /** - * @return the cancel fee, cost for removing this dye from the player. - */ - public int getCancelFee() - { - return _cancelFee; - } - - /** - * @return the cancel count, the retrieved amount of dye items after removing the dye. - */ - public int getCancelCount() - { - return _cancelCount; - } - - /** - * @return the duration of this dye. - */ - public int getDuration() - { - return _duration; - } - - /** - * @param skillList the list of skills related to this dye. - */ - public void setSkills(List skillList) - { - _skills.addAll(skillList); - } - - /** - * @return the skills related to this dye. - */ - public List getSkills() - { - return _skills; - } - - /** - * @return the list with the allowed classes to wear this dye. - */ - public List getAllowedWearClass() - { - return _wearClass; - } - - /** - * @param classId the class trying to wear this dye. - * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise. - */ - public boolean isAllowedClass(ClassId classId) - { - return _wearClass.contains(classId); - } - - /** - * @param wearClassIds the list of classes that can wear this dye. - */ - public void setWearClassIds(List wearClassIds) - { - _wearClass.addAll(wearClassIds); - } -} \ No newline at end of file diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java deleted file mode 100644 index c632a41dfb..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/PlayerItemTemplate.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author Zoey76 - */ -public class PlayerItemTemplate extends ItemHolder -{ - private final boolean _equipped; - - /** - * @param set the set containing the values for this object - */ - public PlayerItemTemplate(StatSet set) - { - super(set.getInt("id"), set.getInt("count")); - _equipped = set.getBoolean("equipped", false); - } - - /** - * @return {@code true} if the items is equipped upon character creation, {@code false} otherwise - */ - public boolean isEquipped() - { - return _equipped; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/Weapon.java deleted file mode 100644 index 832169f5f1..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ /dev/null @@ -1,311 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items; - -import org.l2jmobius.commons.util.Rnd; -import org.l2jmobius.gameserver.enums.ItemSkillType; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Npc; -import org.l2jmobius.gameserver.model.events.EventDispatcher; -import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.model.skills.Skill; -import org.l2jmobius.gameserver.model.stats.Formulas; -import org.l2jmobius.gameserver.network.SystemMessageId; -import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; -import org.l2jmobius.gameserver.util.Util; - -/** - * This class is dedicated to the management of weapons. - */ -public class Weapon extends ItemTemplate -{ - private WeaponType _type; - private boolean _isMagicWeapon; - private int _soulShotCount; - private int _spiritShotCount; - private int _mpConsume; - private int _baseAttackRange; - private int _baseAttackRadius; - private int _baseAttackAngle; - private int _changeWeaponId; - - private int _reducedSoulshot; - private int _reducedSoulshotChance; - - private int _reducedMpConsume; - private int _reducedMpConsumeChance; - - private boolean _isForceEquip; - private boolean _isAttackWeapon; - private boolean _useWeaponSkillsOnly; - - /** - * Constructor for Weapon. - * @param set the StatSet designating the set of couples (key,value) characterizing the weapon. - */ - public Weapon(StatSet set) - { - super(set); - } - - @Override - public void set(StatSet set) - { - super.set(set); - _type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase()); - _type1 = ItemTemplate.TYPE1_WEAPON_RING_EARRING_NECKLACE; - _type2 = ItemTemplate.TYPE2_WEAPON; - _isMagicWeapon = set.getBoolean("is_magic_weapon", false); - _soulShotCount = set.getInt("soulshots", 0); - _spiritShotCount = set.getInt("spiritshots", 0); - _mpConsume = set.getInt("mp_consume", 0); - _baseAttackRange = set.getInt("attack_range", 40); - final String[] damageRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle - if ((damageRange.length > 1) && Util.isDigit(damageRange[2]) && Util.isDigit(damageRange[3])) - { - _baseAttackRadius = Integer.parseInt(damageRange[2]); - _baseAttackAngle = 360 - Integer.parseInt(damageRange[3]); - } - else - { - _baseAttackRadius = 40; - _baseAttackAngle = 240; // 360 - 120 - } - - final String[] reducedSoulshots = set.getString("reduced_soulshot", "").split(","); - _reducedSoulshotChance = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[0]) : 0; - _reducedSoulshot = (reducedSoulshots.length == 2) ? Integer.parseInt(reducedSoulshots[1]) : 0; - - final String[] reducedMpConsume = set.getString("reduced_mp_consume", "").split(","); - _reducedMpConsumeChance = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[0]) : 0; - _reducedMpConsume = (reducedMpConsume.length == 2) ? Integer.parseInt(reducedMpConsume[1]) : 0; - _changeWeaponId = set.getInt("change_weaponId", 0); - _isForceEquip = set.getBoolean("isForceEquip", false); - _isAttackWeapon = set.getBoolean("isAttackWeapon", true); - _useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false); - } - - /** - * @return the type of Weapon - */ - @Override - public WeaponType getItemType() - { - return _type; - } - - /** - * @return the ID of the Etc item after applying the mask. - */ - @Override - public int getItemMask() - { - return _type.mask(); - } - - /** - * @return {@code true} if the item is a weapon, {@code false} otherwise. - */ - @Override - public boolean isWeapon() - { - return true; - } - - /** - * @return {@code true} if the weapon is magic, {@code false} otherwise. - */ - @Override - public boolean isMagicWeapon() - { - return _isMagicWeapon; - } - - /** - * @return the quantity of SoulShot used. - */ - public int getSoulShotCount() - { - return _soulShotCount; - } - - /** - * @return the quantity of SpiritShot used. - */ - public int getSpiritShotCount() - { - return _spiritShotCount; - } - - /** - * @return the reduced quantity of SoultShot used. - */ - public int getReducedSoulShot() - { - return _reducedSoulshot; - } - - /** - * @return the chance to use Reduced SoultShot. - */ - public int getReducedSoulShotChance() - { - return _reducedSoulshotChance; - } - - /** - * @return the MP consumption with the weapon. - */ - public int getMpConsume() - { - return _mpConsume; - } - - public int getBaseAttackRange() - { - return _baseAttackRange; - } - - public int getBaseAttackRadius() - { - return _baseAttackRadius; - } - - public int getBaseAttackAngle() - { - return _baseAttackAngle; - } - - /** - * @return the reduced MP consumption with the weapon. - */ - public int getReducedMpConsume() - { - return _reducedMpConsume; - } - - /** - * @return the chance to use getReducedMpConsume() - */ - public int getReducedMpConsumeChance() - { - return _reducedMpConsumeChance; - } - - /** - * @return the Id in which weapon this weapon can be changed. - */ - public int getChangeWeaponId() - { - return _changeWeaponId; - } - - /** - * @return {@code true} if the weapon is force equip, {@code false} otherwise. - */ - public boolean isForceEquip() - { - return _isForceEquip; - } - - /** - * @return {@code true} if the weapon is attack weapon, {@code false} otherwise. - */ - public boolean isAttackWeapon() - { - return _isAttackWeapon; - } - - /** - * @return {@code true} if the weapon is skills only, {@code false} otherwise. - */ - public boolean useWeaponSkillsOnly() - { - return _useWeaponSkillsOnly; - } - - /** - * @param caster the Creature pointing out the caster - * @param target the Creature pointing out the target - * @param trigger - * @param type - */ - public void applyConditionalSkills(Creature caster, Creature target, Skill trigger, ItemSkillType type) - { - forEachSkill(type, holder -> - { - final Skill skill = holder.getSkill(); - if (Rnd.get(100) >= holder.getChance()) - { - return; - } - - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // Trigger only if both are good or bad magic. - if (trigger.isBad() != skill.isBad()) - { - return; - } - - // No Trigger if not Magic Skill or is toggle - if (trigger.isMagic() != skill.isMagic()) - { - return; - } - - // No Trigger if skill is toggle - if (trigger.isToggle()) - { - return; - } - - if (skill.isBad() && (Formulas.calcShldUse(caster, target) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) - { - return; - } - } - - // Skill condition not met - if (!skill.checkCondition(caster, target, true)) - { - return; - } - - skill.activateSkill(caster, target); - - // TODO: Verify if this applies ONLY to ON_MAGIC_SKILL! - if (type == ItemSkillType.ON_MAGIC_SKILL) - { - // notify quests of a skill use - if (caster.isPlayer()) - { - World.getInstance().forEachVisibleObjectInRange(caster, Npc.class, 1000, npc -> EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npc, caster.getActingPlayer(), skill, false, target), npc)); - } - if (caster.isPlayer()) - { - final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED); - sm.addSkillName(skill); - caster.sendPacket(sm); - } - } - }); - } -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java deleted file mode 100644 index 54e66a6721..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceHandType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceHandType -{ - NONE, - ONE_HANDED, - TWO_HANDED, -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java deleted file mode 100644 index 183600e31d..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceMagicType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceMagicType -{ - NONE, - MAGICAL, - PHYISICAL, -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java deleted file mode 100644 index a568389489..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceStone.java +++ /dev/null @@ -1,558 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.data.ItemTable; -import org.l2jmobius.gameserver.enums.Race; -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.holders.AppearanceHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; -import org.l2jmobius.gameserver.network.SystemMessageId; - -/** - * @author UnAfraid - */ -public class AppearanceStone -{ - private final int _id; - private final int _cost; - private final int _visualId; - private final long _lifeTime; - private final AppearanceType _type; - private final WeaponType _weaponType; - private final ArmorType _armorType; - private final AppearanceHandType _handType; - private final AppearanceMagicType _magicType; - private List _crystalTypes; - private List _targetTypes; - private List _bodyParts; - private List _races; - private List _racesNot; - private List _allVisualIds; - - public AppearanceStone(StatSet set) - { - _id = set.getInt("id"); - _visualId = set.getInt("visualId", 0); - _cost = set.getInt("cost", 0); - _lifeTime = set.getDuration("lifeTime", Duration.ofSeconds(0)).toMillis(); - _type = set.getEnum("type", AppearanceType.class, AppearanceType.NONE); - _weaponType = set.getEnum("weaponType", WeaponType.class, WeaponType.NONE); - _armorType = set.getEnum("armorType", ArmorType.class, ArmorType.NONE); - _handType = set.getEnum("handType", AppearanceHandType.class, AppearanceHandType.NONE); - _magicType = set.getEnum("magicType", AppearanceMagicType.class, AppearanceMagicType.NONE); - - final AppearanceTargetType targetType = set.getEnum("targetType", AppearanceTargetType.class, AppearanceTargetType.NONE); - if (targetType != AppearanceTargetType.NONE) - { - addTargetType(targetType); - } - - // No grade items cannot change appearance, because client doesn't have No-Grade restoration stones. - final CrystalType crystalType = set.getEnum("grade", CrystalType.class, null); - - // If no crystal type is defined, we must add all defaults. - if (crystalType == null) - { - switch (targetType) - { - case ACCESSORY: - case ALL: - { - addCrystalType(CrystalType.NONE); - // fallthrough - } - case WEAPON: - case ARMOR: - { - for (CrystalType cryType : CrystalType.values()) - { - if ((cryType != CrystalType.NONE) && (cryType != CrystalType.EVENT)) - { - addCrystalType(cryType); - } - } - } - } - } - else - { - addCrystalType(crystalType); - } - - final long bodyPart = ItemTable.SLOTS.get(set.getString("bodyPart", "none")); - if (bodyPart != ItemTemplate.SLOT_NONE) - { - addBodyPart(bodyPart); - } - - final Race race = set.getEnum("race", Race.class, Race.NONE); - if (race != Race.NONE) - { - addRace(race); - } - - final Race raceNot = set.getEnum("raceNot", Race.class, Race.NONE); - if (raceNot != Race.NONE) - { - addRaceNot(raceNot); - } - } - - public int getId() - { - return _id; - } - - public int getVisualId() - { - return _visualId; - } - - public int getCost() - { - return _cost; - } - - public long getLifeTime() - { - return _lifeTime; - } - - public AppearanceType getType() - { - return _type; - } - - public WeaponType getWeaponType() - { - return _weaponType; - } - - public ArmorType getArmorType() - { - return _armorType; - } - - public AppearanceHandType getHandType() - { - return _handType; - } - - public AppearanceMagicType getMagicType() - { - return _magicType; - } - - public void addCrystalType(CrystalType type) - { - if (_crystalTypes == null) - { - _crystalTypes = new ArrayList<>(); - } - _crystalTypes.add(type); - } - - public List getCrystalTypes() - { - return _crystalTypes != null ? _crystalTypes : Collections.emptyList(); - } - - public void addTargetType(AppearanceTargetType type) - { - if (_targetTypes == null) - { - _targetTypes = new ArrayList<>(); - } - _targetTypes.add(type); - } - - public List getTargetTypes() - { - return _targetTypes != null ? _targetTypes : Collections.emptyList(); - } - - public void addBodyPart(long part) - { - if (_bodyParts == null) - { - _bodyParts = new ArrayList<>(); - } - _bodyParts.add(part); - } - - public void addVisualId(AppearanceHolder appearanceHolder) - { - if (_allVisualIds == null) - { - _allVisualIds = new ArrayList<>(); - } - _allVisualIds.add(appearanceHolder); - } - - public List getVisualIds() - { - return _allVisualIds != null ? _allVisualIds : Collections.emptyList(); - } - - public List getBodyParts() - { - return _bodyParts != null ? _bodyParts : Collections.emptyList(); - } - - public void addRace(Race race) - { - if (_races == null) - { - _races = new ArrayList<>(); - } - _races.add(race); - } - - public List getRaces() - { - return _races != null ? _races : Collections.emptyList(); - } - - public void addRaceNot(Race race) - { - if (_racesNot == null) - { - _racesNot = new ArrayList<>(); - } - _racesNot.add(race); - } - - public List getRacesNot() - { - return _racesNot != null ? _racesNot : Collections.emptyList(); - } - - /** - * @param player the actor requesting to use this appearance. - * @param targetItem the item to be modified with this appearance. - * @return {@code true} if the item is valid for appearance change, {@code false} otherwise. - */ - public boolean checkConditions(Player player, Item targetItem) - { - if (targetItem == null) - { - return false; - } - - if (getTargetTypes().isEmpty()) - { - return false; - } - - if (targetItem.isEquipped() && (getRacesNot().contains(player.getRace()) || (!getRaces().isEmpty() && !getRaces().contains(player.getRace())))) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_AN_EQUIPPED_ITEM_INTO_THE_APPEARANCE_OF_AN_UNEQUIPPABLE_ITEM_PLEASE_CHECK_RACE_GENDER_RESTRICTIONS_YOU_CAN_MODIFY_THE_APPEARANCE_IF_YOU_UNEQUIP_THE_ITEM); - return false; - } - - switch (_type) - { - case RESTORE: - { - if (targetItem.getVisualId() == 0) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_ITEMS_THAT_HAVE_NOT_BEEN_MODIFIED); - return false; - } - - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - default: - { - // Seems like in retail item with already changed appearance, can be changed again without being restored. - - final AppearanceTargetType targetType = getTargetTypes().get(0); - switch (targetType) - { - case NONE: - { - return false; - } - case WEAPON: - { - if (!targetItem.isWeapon()) - { - player.sendPacket(SystemMessageId.WEAPONS_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ARMOR: - { - if (!targetItem.isArmor()) - { - player.sendPacket(SystemMessageId.ARMOR_ONLY); - return false; - } - - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); - return false; - } - break; - } - case ACCESSORY: - { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) - { - player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); - return false; - } - break; - } - case ALL: - { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (findVisualChange(targetItem) == null) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - return true; - } - } - break; - } - } - - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - - if (_weaponType != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != _weaponType)) - { - if (_weaponType != WeaponType.CROSSBOW) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_USED_AS_AN_APPEARANCE_WEAPON); - return false; - } - } - - switch (_handType) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - } - - switch (_magicType) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - if (_armorType != ArmorType.NONE) - { - switch (_armorType) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); - return false; - } - } - } - } - - return true; - } - - public AppearanceHolder findVisualChange(Item targetItem) - { - for (AppearanceHolder holder : _allVisualIds) - { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) - { - continue; - } - - if (holder.getWeaponType() != WeaponType.NONE) - { - if (!targetItem.isWeapon() || (targetItem.getItemType() != holder.getWeaponType())) - { - if (holder.getWeaponType() != WeaponType.CROSSBOW) - { - continue; - } - else if ((targetItem.getItemType() != WeaponType.CROSSBOW) && (targetItem.getItemType() != WeaponType.TWOHANDCROSSBOW)) - { - continue; - } - } - - switch (holder.getHandType()) - { - case ONE_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) - { - continue; - } - break; - } - case TWO_HANDED: - { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) - { - continue; - } - break; - } - } - - switch (holder.getMagicType()) - { - case MAGICAL: - { - if (!targetItem.getItem().isMagicWeapon()) - { - continue; - } - break; - } - case PHYISICAL: - { - if (targetItem.getItem().isMagicWeapon()) - { - continue; - } - } - } - } - - if (holder.getArmorType() != ArmorType.NONE) - { - switch (holder.getArmorType()) - { - case SHIELD: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SHIELD)) - { - continue; - } - break; - } - case SIGIL: - { - if (!targetItem.isArmor() || (targetItem.getItemType() != ArmorType.SIGIL)) - { - continue; - } - } - } - } - return holder; - } - return null; - } -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java deleted file mode 100644 index 0b31f45cd8..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceTargetType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceTargetType -{ - NONE, - WEAPON, - ARMOR, - ACCESSORY, - ALL -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java deleted file mode 100644 index a6dfe151d7..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/appearance/AppearanceType.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.appearance; - -/** - * @author UnAfraid - */ -public enum AppearanceType -{ - NONE, - NORMAL, - BLESSED, - FIXED, - RESTORE -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java deleted file mode 100644 index f36ed1b5c5..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemReward.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -import org.l2jmobius.gameserver.model.holders.ItemHolder; - -/** - * @author UnAfraid - */ -public class CombinationItemReward extends ItemHolder -{ - private final CombinationItemType _type; - - public CombinationItemReward(int id, int count, CombinationItemType type) - { - super(id, count); - _type = type; - } - - public CombinationItemType getType() - { - return _type; - } -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java deleted file mode 100644 index e1a3a657ad..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/combination/CombinationItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.combination; - -/** - * @author UnAfraid - */ -public enum CombinationItemType -{ - ON_SUCCESS, - ON_FAILURE; -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java deleted file mode 100644 index 7ba1d42d99..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantItemGroup.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.l2jmobius.gameserver.model.holders.RangeChanceHolder; - -/** - * @author UnAfraid - */ -public class EnchantItemGroup -{ - private static final Logger LOGGER = Logger.getLogger(EnchantItemGroup.class.getName()); - private final List _chances = new ArrayList<>(); - private final String _name; - private int _maximumEnchant = -1; - - public EnchantItemGroup(String name) - { - _name = name; - } - - /** - * @return name of current enchant item group. - */ - public String getName() - { - return _name; - } - - /** - * @param holder - */ - public void addChance(RangeChanceHolder holder) - { - _chances.add(holder); - } - - /** - * @param index - * @return chance for success rate for current enchant item group. - */ - public double getChance(int index) - { - if (!_chances.isEmpty()) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getMin() <= index) && (holder.getMax() >= index)) - { - return holder.getChance(); - } - } - LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't match proper chance for item group: " + _name); - return _chances.get(_chances.size() - 1).getChance(); - } - LOGGER.warning(getClass().getSimpleName() + ": item group: " + _name + " doesn't have any chances!"); - return -1; - } - - /** - * @return the maximum enchant level for current enchant item group. - */ - public int getMaximumEnchant() - { - if (_maximumEnchant == -1) - { - for (RangeChanceHolder holder : _chances) - { - if ((holder.getChance() > 0) && (holder.getMax() > _maximumEnchant)) - { - _maximumEnchant = holder.getMax(); - } - } - _maximumEnchant++; - } - return _maximumEnchant; - } -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java deleted file mode 100644 index fe698d8e2a..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantRateItem.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantRateItem -{ - private final String _name; - private int _itemId; - private long _slot; - private Boolean _isMagicWeapon = null; - - public EnchantRateItem(String name) - { - _name = name; - } - - /** - * @return name of enchant group. - */ - public String getName() - { - return _name; - } - - /** - * Adds item id verification. - * @param id - */ - public void setItemId(int id) - { - _itemId = id; - } - - /** - * Adds body slot verification. - * @param slot - */ - public void addSlot(long slot) - { - _slot |= slot; - } - - /** - * Adds magic weapon verification. - * @param magicWeapon - */ - public void setMagicWeapon(boolean magicWeapon) - { - _isMagicWeapon = magicWeapon ? Boolean.TRUE : Boolean.FALSE; - } - - /** - * @param item - * @return {@code true} if item can be used with this rate group, {@code false} otherwise. - */ - public boolean validate(ItemTemplate item) - { - if ((_itemId != 0) && (_itemId != item.getId())) - { - return false; - } - else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) - { - return false; - } - else if ((_isMagicWeapon != null) && (item.isMagicWeapon() != _isMagicWeapon.booleanValue())) - { - return false; - } - return true; - } -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java deleted file mode 100644 index 3e17edd870..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantResultType.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -/** - * @author UnAfraid - */ -public enum EnchantResultType -{ - ERROR, - SUCCESS, - FAILURE -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java deleted file mode 100644 index 3a4fff76e5..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScrollGroup.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.l2jmobius.gameserver.model.items.ItemTemplate; - -/** - * @author UnAfraid - */ -public class EnchantScrollGroup -{ - private final int _id; - private List _rateGroups; - - public EnchantScrollGroup(int id) - { - _id = id; - } - - /** - * @return id of current enchant scroll group. - */ - public int getId() - { - return _id; - } - - /** - * Adds new rate group. - * @param group - */ - public void addRateGroup(EnchantRateItem group) - { - if (_rateGroups == null) - { - _rateGroups = new ArrayList<>(); - } - _rateGroups.add(group); - } - - /** - * @return {@code List} of all enchant rate items, Empty list if none. - */ - public List getRateGroups() - { - return _rateGroups != null ? _rateGroups : Collections.emptyList(); - } - - /** - * @param item - * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with. - */ - public EnchantRateItem getRateGroup(ItemTemplate item) - { - for (EnchantRateItem group : getRateGroups()) - { - if (group.validate(item)) - { - return group; - } - } - return null; - } -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java deleted file mode 100644 index 13d6b5a2ee..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/EnchantSupportItem.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant; - -import org.l2jmobius.gameserver.model.StatSet; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; - -/** - * @author UnAfraid - */ -public class EnchantSupportItem extends AbstractEnchantItem -{ - private final boolean _isWeapon; - private final boolean _isBlessed; - private final boolean _isGiant; - private final ItemType type; - - public EnchantSupportItem(StatSet set) - { - super(set); - type = getItem().getItemType(); - _isWeapon = (type == EtcItemType.ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isBlessed = (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - _isGiant = (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_AM) || (type == EtcItemType.BLESSED_GIANT_ENCHT_ATTR_INC_PROP_ENCHT_WP); - } - - @Override - public boolean isWeapon() - { - return _isWeapon; - } - - public boolean isBlessed() - { - return _isBlessed; - } - - public boolean isGiant() - { - return _isGiant; - } -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java deleted file mode 100644 index c8b8dff6ad..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/enchant/attribute/AttributeHolder.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.enchant.attribute; - -import org.l2jmobius.gameserver.enums.AttributeType; - -/** - * @author UnAfraid - */ -public class AttributeHolder -{ - private final AttributeType _type; - private int _value; - - public AttributeHolder(AttributeType type, int value) - { - _type = type; - _value = value; - } - - public AttributeType getType() - { - return _type; - } - - public int getValue() - { - return _value; - } - - public void setValue(int value) - { - _value = value; - } - - public void incValue(int with) - { - _value += with; - } - - @Override - public String toString() - { - return _type.name() + " +" + _value; - } -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/ActionType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/ActionType.java deleted file mode 100644 index 3693ba3816..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/ActionType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Action Type enumerated. - * @author nBd - */ -public enum ActionType -{ - CALC, - CALL_SKILL, - CAPSULE, - CREATE_MPCC, - DICE, - EQUIP, - FISHINGSHOT, - HARVEST, - HIDE_NAME, - KEEP_EXP, - NICK_COLOR, - NONE, - PEEL, - RECIPE, - SEED, - SHOW_ADVENTURER_GUIDE_BOOK, - SHOW_HTML, - SHOW_SSQ_STATUS, - SKILL_MAINTAIN, - SKILL_REDUCE, - SOULSHOT, - SPIRITSHOT, - START_QUEST, - SUMMON_SOULSHOT, - SUMMON_SPIRITSHOT, - XMAS_OPEN, - SKILL_REDUCE_ON_SKILL_SUCCESS, - SHOW_TUTORIAL -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java deleted file mode 100644 index b0dd4eb906..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/ArmorType.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Armor Type enumerated. - */ -public enum ArmorType implements ItemType -{ - NONE, - LIGHT, - HEAVY, - MAGIC, - SIGIL, - - // L2J CUSTOM - SHIELD; - - final int _mask; - - /** - * Constructor of the ArmorType. - */ - ArmorType() - { - _mask = 1 << (ordinal() + WeaponType.values().length); - } - - /** - * @return the ID of the ArmorType after applying a mask. - */ - @Override - public int mask() - { - return _mask; - } -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java deleted file mode 100644 index d059efd025..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Crystal Type enumerated. - * @author Adry_85 - */ -public enum CrystalType -{ - NONE(0, 0, 0, 0), - D(1, 1458, 11, 90), - C(2, 1459, 6, 45), - B(3, 1460, 11, 67), - A(4, 1461, 20, 145), - S(5, 1462, 25, 250), - S80(6, 1462, 25, 250), - S84(7, 1462, 25, 250), - R(8, 17371, 30, 500), - R95(9, 17371, 30, 500), - R99(10, 17371, 30, 500), - EVENT(11, 0, 0, 0); - - private final int _level; - private final int _crystalId; - private final int _crystalEnchantBonusArmor; - private final int _crystalEnchantBonusWeapon; - - CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) - { - _level = level; - _crystalId = crystalId; - _crystalEnchantBonusArmor = crystalEnchantBonusArmor; - _crystalEnchantBonusWeapon = crystalEnchantBonusWeapon; - } - - /** - * Gets the crystal type ID. - * @return the crystal type ID - */ - public int getLevel() - { - return _level; - } - - /** - * Gets the item ID of the crystal. - * @return the item ID of the crystal - */ - public int getCrystalId() - { - return _crystalId; - } - - public int getCrystalEnchantBonusArmor() - { - return _crystalEnchantBonusArmor; - } - - public int getCrystalEnchantBonusWeapon() - { - return _crystalEnchantBonusWeapon; - } - - public boolean isGreater(CrystalType crystalType) - { - return getLevel() > crystalType.getLevel(); - } - - public boolean isLesser(CrystalType crystalType) - { - return getLevel() < crystalType.getLevel(); - } -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/ItemType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/ItemType.java deleted file mode 100644 index 8624a506ca..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/ItemType.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Created for allow comparing different item types - * @author DS - */ -public interface ItemType -{ - int mask(); -} \ No newline at end of file diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java deleted file mode 100644 index acd27c9e3e..0000000000 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/items/type/MaterialType.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.model.items.type; - -/** - * Material Type enumerated. - * @author Adry_85 - */ -public enum MaterialType -{ - STEEL, - FINE_STEEL, - COTTON, - BLOOD_STEEL, - BRONZE, - SILVER, - GOLD, - MITHRIL, - ORIHARUKON, - PAPER, - WOOD, - CLOTH, - LEATHER, - BONE, - HORN, - DAMASCUS, - ADAMANTAITE, - CHRYSOLITE, - CRYSTAL, - LIQUID, - SCALE_OF_DRAGON, - DYESTUFF, - COBWEB, - SEED, - FISH, - RUNE_XP, - RUNE_SP, - RUNE_REMOVE_PENALTY; -} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 5f818e731e..2ec9bd8f69 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/Hero.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/Hero.java index 17c83523b7..44a87d7c08 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/Hero.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/olympiad/Hero.java @@ -48,8 +48,8 @@ import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerTakeHero; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/Quest.java index c5d11839a5..3f3ec696ae 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -64,8 +64,8 @@ import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Participant; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java index ba64fb057e..fc74267ac4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/residences/ResidenceFunction.java @@ -24,8 +24,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.xml.ResidenceFunctionsData; import org.l2jmobius.gameserver.model.clan.Clan; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.AgitDecoInfo; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java index 79a3359d83..822b35398f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.EffectTaskInfo; import org.l2jmobius.gameserver.model.effects.EffectTickTask; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skills/Skill.java index 4f8839c353..d777746032 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -54,7 +54,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.AttachSkillHolder; import org.l2jmobius.gameserver.model.interfaces.IIdentifiable; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.targets.AffectObject; import org.l2jmobius.gameserver.model.skills.targets.AffectScope; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index bbba3742ef..2055a805bb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -58,10 +58,10 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcSkillSee; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.model.options.OptionsSkillHolder; import org.l2jmobius.gameserver.model.options.OptionsSkillType; import org.l2jmobius.gameserver.model.skills.targets.TargetType; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java index 54907880aa..63f20c77b2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -39,11 +39,11 @@ import org.l2jmobius.gameserver.model.cubic.Cubic; import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.interfaces.ILocational; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 45d32295d2..463ea798f0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.transform.TransformType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index 58418e1c88..b057f5c85d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -20,9 +20,9 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java index 54144de995..cdfbb0ec8b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java index 577ca267e7..65b445397e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java index f4bf542a6d..05d0c728ec 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MCritRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index 38a7116383..ff0ad75b8a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -22,8 +22,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java index f9ad19c993..0c81fe5bd0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index c1cac0d20a..02c4f00cf6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemHPBonusData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 1839afb5ce..334fb9252a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -21,8 +21,8 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java index bdc267dfef..85351d2249 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAccuracyFinalizer.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.stats.finalizers; import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.taskmanager.GameTimeTaskManager; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java index 7109a54ed1..5df6b208a3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java index 9be24ff19d..7c1dc36f89 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PCriticalRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index 165f9b4668..80e30184ff 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -22,9 +22,9 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java index cf5d65aab8..85e74054f1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/PEvasionRateFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java index df3acc3df1..7c51b0ad38 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/ShotsBonusFinalizer.java @@ -20,7 +20,7 @@ import java.util.OptionalDouble; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java index 06085447e6..a7467985dc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/finalizers/SpeedFinalizer.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.PetLevelData; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.model.stats.IStatFunction; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java index 31a1699285..11832b5266 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/teleporter/TeleportHolder.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcTeleportRequest; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java index acd754d9b3..697c191310 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/zone/ZoneForm.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.zone; import org.l2jmobius.gameserver.instancemanager.IdManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.Location; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * Abstract base class for any zone form diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 3c8e441156..8548ad1d3a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java index cfb6455ad0..31d29ef3dd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.TradeOtherAdd; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 3b750492b6..379ce7e1ee 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -39,8 +39,8 @@ import org.l2jmobius.gameserver.model.actor.templates.PlayerTemplate; import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerCreate; -import org.l2jmobius.gameserver.model.items.PlayerItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.PlayerItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.CharCreateFail; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 7323e0f5c9..8ba3d95227 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -52,10 +52,10 @@ import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.punishment.PunishmentAffect; import org.l2jmobius.gameserver.model.punishment.PunishmentType; import org.l2jmobius.gameserver.model.quest.Quest; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java index 9ae9a1e7a9..0fdbec0a51 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MoveToLocationInAirShip.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.AirShip; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExMoveToLocationInAirShip; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 212831b0aa..881fa14e23 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -36,11 +36,11 @@ import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPCCafePointInfo; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 7c2ffd3381..04cf0eb4aa 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.ShotType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index 2c4b4937dc..d77d8eba6a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index 8e4db9d92c..a7e3f28ed6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -37,7 +37,7 @@ import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcManorBypass; import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerBypass; import org.l2jmobius.gameserver.model.events.returns.TerminateReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.Hero; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 6c3be1e95f..2a92b7c8f7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java index 9f3e10e7bf..080e9ff29b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java index b0fe6b542c..4534c39c18 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationCancel; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java index d90a51d0b1..f1ddb94865 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java index b17b10da50..f95c21b0bd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java index 807c9bbaa7..dc81cb23dc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutItemResultForVariationMake; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 1108bbf2dd..751e6d4a4f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -26,9 +26,9 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.enums.Race; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 4187b31783..fe9f7b3d25 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -31,8 +31,8 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index 6cc03e2c2b..48cdb8e80b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.SkillUseHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.SkillCaster; import org.l2jmobius.gameserver.model.zone.ZoneId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index a02ebff6c0..5bf735ff2f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -28,11 +28,11 @@ import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.enchant.EnchantResultType; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.enchant.EnchantResultType; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index e8d9134e51..ae1ce1bebe 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantScrollItemResult; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 27720bdb00..31c0ac34f6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemAttributeRequest; import org.l2jmobius.gameserver.model.holders.ElementalItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExAttributeEnchantResult; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java index 9c0b0cebbc..f053f92a03 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveEnchantSupportItem.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRemoveEnchantSupportItemResult; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index e8f653a83c..a4e3d49ec4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExBaseAttributeCancelResult; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 034f903d6b..c55df32ab6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ExRpItemLink; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java index bb3f77d7be..b0316c2a16 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.enchant.EnchantSupportItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.enchant.EnchantSupportItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantSupportItemResult; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java index e92b082c84..77093c5f2d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java @@ -21,8 +21,8 @@ import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.data.xml.EnchantItemData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.EnchantItemRequest; -import org.l2jmobius.gameserver.model.items.enchant.EnchantScroll; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.EnchantScroll; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExPutEnchantTargetItemResult; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index ce98ab493d..d0add3fa49 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java index 47110451ad..fa21b68043 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemDrawInfo; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java index 9d16c7e58c..b943775334 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.HennaItemRemoveInfo; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java index 595da81538..ab9f0c33f7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestHennaRemove.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java index 945ff531e4..b9c3900403 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.BoatManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Boat; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 18485fdbd4..4d3adf25dc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 04ebc1f9a7..353d28aeb9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -27,8 +27,8 @@ import org.l2jmobius.gameserver.instancemanager.MailManager; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java index 51de837e9e..e56c105cf4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestPreviewItem.java @@ -31,12 +31,12 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; +import org.l2jmobius.gameserver.model.item.Armor; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.Weapon; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.Armor; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.Weapon; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 37de73927b..bee0568e03 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -28,8 +28,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java index 8ac47eea12..5364e67986 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Variation; import org.l2jmobius.gameserver.model.options.VariationFee; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java index 3c180f4ef9..4da834c30d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.VariationData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ExVariationCancelResult; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cbe6cf799d..a4010ca2cb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java index 8107fa5a51..7ea8c00de2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSaveInventoryOrder.java @@ -22,8 +22,8 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 9592beafea..7b82b33d56 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Merchant; import org.l2jmobius.gameserver.model.buylist.ProductList; import org.l2jmobius.gameserver.model.holders.UniqueItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.network.serverpackets.ExBuySellList; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java index cb16d5cc7d..cd8e900014 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestSendPost.java @@ -30,8 +30,8 @@ import org.l2jmobius.gameserver.model.AccessLevel; import org.l2jmobius.gameserver.model.BlockList; import org.l2jmobius.gameserver.model.Message; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Mail; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 3e06fab27a..47ce1532d4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -21,9 +21,9 @@ import java.util.List; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index ff56c5b0a4..88a9e1c787 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerChat; import org.l2jmobius.gameserver.model.events.returns.ChatFilterReturn; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.olympiad.OlympiadManager; import org.l2jmobius.gameserver.network.Disconnection; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java index 61920f471b..f89be1cfcb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java @@ -26,9 +26,9 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 6efd85f083..cff7284f2f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.ClanPrivilege; import org.l2jmobius.gameserver.model.holders.ItemHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.util.Util; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index 2019041cd7..b8dca5ea47 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.TradeList; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 16c15edcdf..d3b33be1bb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -39,11 +39,11 @@ import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.ActionType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.ActionType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index ef3205bc48..055dc2dd1e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -21,11 +21,11 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 2bd8ba2fa2..f7aa0f3047 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.data.xml.AppearanceItemData; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 340eefe196..1de9056bda 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.ShapeShiftingItemRequest; import org.l2jmobius.gameserver.model.holders.AppearanceHolder; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java index 81e3a8f4c9..7e89bd6ed3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attendance/RequestVipAttendanceCheck.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.AttendanceRewardData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java index cc4e389242..abea70c48a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/RequestChangeAttributeItem.java @@ -20,9 +20,9 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java index 6eae817b63..bb167218a7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/attributechange/SendChangeAttributeTargetItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.attributechange; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java index cf6407ac6a..f02b7db6aa 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExRequestActivateAutoShortcut.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.ShortCuts; import org.l2jmobius.gameserver.model.Shortcut; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java index e189ffdd74..e750f17389 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionEnchant.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.enums.ItemSkillType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.BlessingItemRequest; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.GameClient; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java index c247027020..249a869c81 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/blessing/RequestBlessOptionPutItem.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets.blessing; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java index 9326803882..b602edf72b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.CollectionDataHolder; import org.l2jmobius.gameserver.model.holders.ItemCollectionData; import org.l2jmobius.gameserver.model.holders.PlayerCollectionData; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.options.Options; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java index 08980fb267..1a7edbbaac 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionInfo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.commission; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java index 33d0e273e1..1ad79b9031 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/commission/RequestCommissionList.java @@ -23,8 +23,8 @@ import org.l2jmobius.gameserver.instancemanager.ItemCommissionManager; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.commission.CommissionItemType; import org.l2jmobius.gameserver.model.commission.CommissionTreeType; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.commission.ExCloseCommission; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java index d8e28130cc..9cc69554c4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushOne.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 0b67368833..53112870da 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -20,8 +20,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java index a989a7a924..0dbe123787 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveOne.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java index ca54d99241..5743927fa1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRemoveTwo.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.compound; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java index 08705b38da..f926d90210 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantRetryToPutItems.java @@ -22,8 +22,8 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 7ed7806afb..8562dc024b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -21,10 +21,10 @@ import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.CombinationItemsData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.CompoundRequest; -import org.l2jmobius.gameserver.model.items.combination.CombinationItem; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemReward; -import org.l2jmobius.gameserver.model.items.combination.CombinationItemType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.combination.CombinationItem; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemReward; +import org.l2jmobius.gameserver.model.item.combination.CombinationItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 1382713f2f..beca532961 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.data.xml.ItemCrystallizationData; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.CrystalType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.CrystalType; import org.l2jmobius.gameserver.model.skills.CommonSkill; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index fc38b11104..ccce24215e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.ensoul.EnsoulStone; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index 662a6e0751..eb65524f28 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.data.xml.EnsoulData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 25c9792ec1..3220827fbb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; import org.l2jmobius.gameserver.model.holders.EquipmentUpgradeHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.items.enchant.attribute.AttributeHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.enchant.attribute.AttributeHolder; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.ItemVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java index e3a0b08b2c..7a72b8ca49 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/limitshop/RequestPurchaseLimitShopItemBuy.java @@ -32,8 +32,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.PrimeShopRequest; import org.l2jmobius.gameserver.model.holders.LimitShopProductHolder; import org.l2jmobius.gameserver.model.holders.LimitShopRandomCraftReward; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.model.variables.AccountVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java index 2c555ed3fe..980b299845 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.LuckyGameDataHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java index deb54b2612..f10148af7e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExEvolvePet.java @@ -15,7 +15,7 @@ import org.l2jmobius.gameserver.model.PetData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java index c9a4bc2a29..4bd0543f06 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java @@ -11,8 +11,8 @@ import org.l2jmobius.gameserver.ai.NextAction; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java index f264888149..aa8e58c146 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetUnequipItem.java @@ -7,8 +7,8 @@ import org.l2jmobius.gameserver.ai.NextAction; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java index 94aaa87554..fee0b270a5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGetItemFromPet.java @@ -20,7 +20,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.pet.PetItemList; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java index 7ba2990cf4..13512321f5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestGiveItemToPet.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.enums.PrivateStoreType; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java index aad73b105e..081a29e9cd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetGetItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeGuardManager; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.siege.Castle; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java index 6feb078651..a3e449b1cc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/RequestPetUseItem.java @@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.handler.IItemHandler; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java index 7d885e7bc8..7b6bf5b6c3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftExtract.java @@ -25,7 +25,7 @@ import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.data.xml.RandomCraftData; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.request.RandomCraftRequest; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.randomcraft.ExCraftExtract; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java index a98c74a7c7..7a3aad8282 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/randomcraft/ExRequestRandomCraftLockSlot.java @@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.network.clientpackets.randomcraft; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.itemcontainer.PlayerRandomCraft; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.randomcraft.ExCraftRandomInfo; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java index 5f892d96c0..4426754057 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/shuttle/MoveToLocationInShuttle.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets.shuttle; import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.type.WeaponType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java index 51cd76618e..af8b12547e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractInventoryUpdate.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentSkipListMap; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 84da450597..c1843be93c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.model.ItemInfo; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; +import org.l2jmobius.gameserver.model.item.WarehouseItem; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.WarehouseItem; -import org.l2jmobius.gameserver.model.items.instance.Item; /** * @author UnAfraid diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 2e13d63f5a..b12458e719 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class DropItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 61fd93e55c..6063a54535 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class EnchantResult implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 708bcf8169..381dd859ad 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -24,7 +24,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index a467a1560c..f51a3eb3ae 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ElementalAttributeData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index 5a7a9c9c3b..a0ba15da9f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.holders.DamageTakenHolder; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 43fa6faeb8..6f00d41989 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 1a4b7904df..2128b2b19f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index 93588924fe..077f33cb49 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 07725028a6..76375a86f7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index bc0afc2644..e6b4b8b604 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -21,8 +21,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.MailType; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index b0727ee8cb..d94dbf4403 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.Message; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 3f712180b2..c58ccfc233 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index c6e4b2ce9a..dd11ee0150 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 833dbf794d..1994402da2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -23,8 +23,8 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.Seed; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 4c9e5eabc7..ef1d37297e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index e4fb9e4160..b65005003d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 51abfa9d3e..f49138fafe 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.clan.Clan; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GMViewWarehouseWithdrawList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index f6fae09769..b0c011b696 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class GetItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 4bd0a38bda..7e0614b359 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.HennaData; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 6d0df16c27..0e6e64c7b2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 61a01d067c..658087380a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 84bc5a6eba..3800940bac 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.model.stats.BaseStat; import org.l2jmobius.gameserver.network.OutgoingPackets; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index b79342c0a8..3a780986a0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.Henna; +import org.l2jmobius.gameserver.model.item.Henna; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 06bd812468..0c54e810f0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index bd768c74e2..c4598a72e6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ItemList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index c94eae4c08..00d7618d34 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.holders.ItemChanceHolder; import org.l2jmobius.gameserver.model.holders.MultisellEntryHolder; import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class MultiSellList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index ced39204d3..fbb5c84dfe 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 4068629bde..d05590cbde 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -21,7 +21,7 @@ import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.TradeItem; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class PrivateStoreManageListBuy extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 6e52b94f2f..813ce03f4d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CastleManorManager; import org.l2jmobius.gameserver.model.CropProcure; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SellListProcure implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 0e6211e63b..358ee2361b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -22,7 +22,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.buylist.Product; import org.l2jmobius.gameserver.model.buylist.ProductList; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.network.OutgoingPackets; public class ShopPreviewList implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 4b115bb480..fd7e43a153 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class SpawnItem implements IClientOutgoingPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 0dc656cef6..2d352ea5cd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -24,8 +24,8 @@ import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c742d534c4..c59568bf1d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -23,7 +23,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class TradeStart extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index a22b36335e..35ca986d35 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseDepositList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 271ec4401b..37150ec357 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; public class WareHouseWithdrawalList extends AbstractItemPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index fe55de5936..549def456e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -17,9 +17,9 @@ package org.l2jmobius.gameserver.network.serverpackets.appearance; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceStone; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceTargetType; -import org.l2jmobius.gameserver.model.items.appearance.AppearanceType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceStone; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceTargetType; +import org.l2jmobius.gameserver.model.item.appearance.AppearanceType; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java index bd880da7fe..a161e90edf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/attributechange/ExChangeAttributeInfo.java @@ -21,7 +21,7 @@ import java.util.Map; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java index db11b2a9b4..d4351a66f9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionRegister.java @@ -17,7 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 6b8cd1358f..c32d4f7c04 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.commission; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java index 602d837d2b..ebd49a889e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnSoulExtractionResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java index bc99eada80..05771d7bdf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ensoul/ExEnsoulResult.java @@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets.ensoul; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ensoul.EnsoulOption; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java index 807bb18802..f45d3262ac 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java @@ -20,7 +20,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.ItemInfo; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractInventoryUpdate; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java index 92ad2b6fc1..cd0744b2c4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java @@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets.pet; import java.util.Collection; import org.l2jmobius.commons.network.PacketWriter; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java index d4e38ef328..a66350d83b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipLuckyGameInfo.java @@ -18,8 +18,8 @@ package org.l2jmobius.gameserver.network.serverpackets.vip; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.actor.Player; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; -import org.l2jmobius.gameserver.model.items.instance.Item; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java index fceabef738..e60ad5658f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java @@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Monster; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.serverpackets.autoplay.ExAutoPlayDoMacro; /** diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java index 3d8ed75cfa..5bda99f939 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoPotionTaskManager.java @@ -23,7 +23,7 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.gameserver.handler.ItemHandler; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius, Gigi diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index 7553a3233e..fb0db44e8e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -37,9 +37,9 @@ import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Guard; import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.EtcItem; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.EtcItem; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.Skill; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java index b47a5a3d51..6cb2c2499a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemAppearanceTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java index c7b954cbe2..cd6aee1bf8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemLifeTimeTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java index a8acd0132c..3902b96886 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemManaTaskManager.java @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Mobius diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index fb3b7b6704..f14bb3063f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java @@ -24,7 +24,7 @@ import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.util.Chronos; import org.l2jmobius.gameserver.enums.ItemLocation; import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; public class ItemsAutoDestroyTaskManager implements Runnable { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/DocumentBase.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/DocumentBase.java index cebed94cd2..a2f01e4fae 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/DocumentBase.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/DocumentBase.java @@ -47,6 +47,9 @@ import org.l2jmobius.gameserver.model.conditions.ConditionChangeWeapon; import org.l2jmobius.gameserver.model.conditions.ConditionGameChance; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime; import org.l2jmobius.gameserver.model.conditions.ConditionGameTime.CheckGameTime; +import org.l2jmobius.gameserver.model.item.ItemTemplate; +import org.l2jmobius.gameserver.model.item.type.ArmorType; +import org.l2jmobius.gameserver.model.item.type.WeaponType; import org.l2jmobius.gameserver.model.conditions.ConditionLogicAnd; import org.l2jmobius.gameserver.model.conditions.ConditionLogicNot; import org.l2jmobius.gameserver.model.conditions.ConditionLogicOr; @@ -135,9 +138,6 @@ import org.l2jmobius.gameserver.model.conditions.ConditionUsingItemType; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSkill; import org.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType; import org.l2jmobius.gameserver.model.conditions.ConditionWithSkill; -import org.l2jmobius.gameserver.model.items.ItemTemplate; -import org.l2jmobius.gameserver.model.items.type.ArmorType; -import org.l2jmobius.gameserver.model.items.type.WeaponType; import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.stats.Stat; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/DocumentItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/DocumentItem.java index e423c75ca2..5be807b2d9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/DocumentItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/DocumentItem.java @@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.model.ExtractableProduct; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.conditions.Condition; import org.l2jmobius.gameserver.model.holders.ItemSkillHolder; -import org.l2jmobius.gameserver.model.items.ItemTemplate; +import org.l2jmobius.gameserver.model.item.ItemTemplate; import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.functions.FuncTemplate; @@ -227,7 +227,7 @@ public class DocumentItem extends DocumentBase implements IXmlReader try { - final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.items." + _currentItem.type).getConstructor(StatSet.class); + final Constructor itemClass = Class.forName("org.l2jmobius.gameserver.model.item." + _currentItem.type).getConstructor(StatSet.class); _currentItem.item = (ItemTemplate) itemClass.newInstance(_currentItem.set); } catch (Exception e) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/Evolve.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/Evolve.java index d065941033..51de657d97 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/Evolve.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/Evolve.java @@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillLaunched; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/log/filter/ItemFilter.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/log/filter/ItemFilter.java index 94641d82e4..b5fcdd9cb6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/log/filter/ItemFilter.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/log/filter/ItemFilter.java @@ -21,9 +21,9 @@ import java.util.Set; import java.util.logging.Filter; import java.util.logging.LogRecord; -import org.l2jmobius.gameserver.model.items.instance.Item; -import org.l2jmobius.gameserver.model.items.type.EtcItemType; -import org.l2jmobius.gameserver.model.items.type.ItemType; +import org.l2jmobius.gameserver.model.item.instance.Item; +import org.l2jmobius.gameserver.model.item.type.EtcItemType; +import org.l2jmobius.gameserver.model.item.type.ItemType; /** * @author Advi diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/log/formatter/EnchantFormatter.java index b99ab0fe37..e590fda16b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/log/formatter/EnchantFormatter.java @@ -24,7 +24,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; import org.l2jmobius.gameserver.model.actor.Player; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.skills.Skill; public class EnchantFormatter extends Formatter diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index e9d079589f..b24cfd796d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/log/formatter/ItemLogFormatter.java @@ -23,7 +23,7 @@ import java.util.logging.LogRecord; import org.l2jmobius.Config; import org.l2jmobius.commons.util.StringUtil; -import org.l2jmobius.gameserver.model.items.instance.Item; +import org.l2jmobius.gameserver.model.item.instance.Item; /** * @author Advi